diff --git a/products/ASC.Files/Client/src/components/Article/Body/index.js b/products/ASC.Files/Client/src/components/Article/Body/index.js
index c6656352d7..54bb094462 100644
--- a/products/ASC.Files/Client/src/components/Article/Body/index.js
+++ b/products/ASC.Files/Client/src/components/Article/Body/index.js
@@ -132,7 +132,8 @@ export default inject(
     const { fetchFiles, filter, setIsLoading } = filesStore;
     const { treeFolders, setSelectedNode, setTreeFolders } = treeFoldersStore;
     const selectedTreeNode =
-      treeFoldersStore.selectedTreeNode.length > 0
+      treeFoldersStore.selectedTreeNode.length > 0 &&
+      treeFoldersStore.selectedTreeNode[0] !== "@my"
         ? treeFoldersStore.selectedTreeNode
         : [selectedFolderStore.id + ""];
 
diff --git a/products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js b/products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
index 573e9fb8f2..8c2cfb4e91 100644
--- a/products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
+++ b/products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
@@ -161,46 +161,42 @@ const SectionBodyContent = ({
   );
 };
 
-export default inject(
-  ({ auth, filesStore, settingsStore, treeFoldersStore }) => {
-    const { isLoading } = filesStore;
-    const { selectedTreeNode } = treeFoldersStore;
-    const {
-      isLoadedSettingsTree,
-      storeOriginalFiles,
-      confirmDelete,
-      updateIfExist,
-      forcesave,
-      storeForcesave,
-      enableThirdParty,
-      setUpdateIfExist,
-      setStoreOriginal,
-      setEnableThirdParty,
-      setConfirmDelete,
-      setStoreForceSave,
-      setForceSave,
-      settingsIsLoaded,
-    } = settingsStore;
+export default inject(({ auth, filesStore, settingsStore }) => {
+  const { isLoading } = filesStore;
+  const {
+    isLoadedSettingsTree,
+    storeOriginalFiles,
+    confirmDelete,
+    updateIfExist,
+    forcesave,
+    storeForcesave,
+    enableThirdParty,
+    setUpdateIfExist,
+    setStoreOriginal,
+    setEnableThirdParty,
+    setConfirmDelete,
+    setStoreForceSave,
+    setForceSave,
+    settingsIsLoaded,
+  } = settingsStore;
 
-    return {
-      isAdmin: auth.isAdmin,
-      isLoading,
-      selectedTreeNode,
-      isLoadedSettingsTree,
-      storeOriginalFiles,
-      confirmDelete,
-      updateIfExist,
-      forceSave: forcesave,
-      storeForceSave: storeForcesave,
-      enableThirdParty,
+  return {
+    isAdmin: auth.isAdmin,
+    isLoading,
+    isLoadedSettingsTree,
+    storeOriginalFiles,
+    confirmDelete,
+    updateIfExist,
+    forceSave: forcesave,
+    storeForceSave: storeForcesave,
+    enableThirdParty,
 
-      setUpdateIfExist,
-      setStoreOriginal,
-      setEnableThirdParty,
-      setConfirmDelete,
-      setStoreForceSave,
-      setForceSave,
-      settingsIsLoaded,
-    };
-  }
-)(observer(SectionBodyContent));
+    setUpdateIfExist,
+    setStoreOriginal,
+    setEnableThirdParty,
+    setConfirmDelete,
+    setStoreForceSave,
+    setForceSave,
+    settingsIsLoaded,
+  };
+})(observer(SectionBodyContent));