diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index 25da562e2..6b722080a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -574,7 +574,9 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
             setupAdapter()
         }
 
-        storeDirectories()
+        if (!isFromCache) {
+            storeDirectories()
+        }
     }
 
     private fun storeDirectories() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index 8a1f25b9c..29b64841d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -620,7 +620,10 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         runOnUiThread {
             setupAdapter()
         }
-        storeFolder()
+
+        if (!isFromCache) {
+            storeFolder()
+        }
     }
 
     private fun storeFolder() {