diff --git a/src/components/Dashboard/common/ObjectSelect.jsx b/src/components/Dashboard/common/ObjectSelect.jsx
index d1b1b6b..4ce9f73 100644
--- a/src/components/Dashboard/common/ObjectSelect.jsx
+++ b/src/components/Dashboard/common/ObjectSelect.jsx
@@ -144,6 +144,7 @@ const ObjectSelect = ({
                 parentKeys: parentKeys.concat(key || '-'),
                 filterPath: newFilterPath,
                 selectable: false,
+
                 children: buildTreeData(
                   value,
                   pIdx + 1,
@@ -278,8 +279,11 @@ const ObjectSelect = ({
         handleFetchObjectsProperties()
         setInitialized(true)
       }
+      if (value == null) {
+        setTreeSelectValue(null)
+        setInitialized(true)
+      }
     }
-
     handleValue()
   }, [
     value,
@@ -303,8 +307,13 @@ const ObjectSelect = ({
 
     if (hasChanged) {
       setObjectPropertiesTree({})
+      setObjectList([])
       setTreeData([])
       setInitialized(false)
+      onTreeSelectChange(null)
+      setTreeSelectValue(null)
+      setInitialLoading(true)
+      setError(false)
       prevValuesRef.current = { type, masterFilter }
     }
   }, [type, masterFilter])
@@ -358,7 +367,7 @@ const ObjectSelect = ({
   return (
     <TreeSelect
       treeDataSimpleMode={false}
-      treeDefaultExpandAll={true}
+      treeDefaultExpandAll={false}
       treeData={treeData}
       showSearch={showSearch}
       multiple={multiple}