2 files changed, 10 insertions, 2 deletions

diff --git a/apps/main.c b/apps/main.c
index c5f2a99943..3145f3693b 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -172,7 +172,14 @@ static int init_dircache(bool preinit)
         }
         
         if (result < 0)
-            gui_syncsplash(0, "Failed! Result: %d", result);
+        {
+            /* Initialization of dircache failed. Manual action is
+             * necessary to enable dircache again.
+             */
+            gui_syncsplash(0, "Dircache failed, disabled. Result: %d", result);
+            global_settings.dircache = false;
+        }
+            
     }
     
     if (clear)
diff --git a/apps/tree.c b/apps/tree.c
index c3c5ce3239..5f5cb1137a 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -1348,7 +1348,8 @@ void tree_flush(void)
         {
             global_status.dircache_size = dircache_get_cache_size();
 # ifdef HAVE_EEPROM_SETTINGS
-            dircache_save();
+            if (firmware_settings.initialized)
+                dircache_save();
 # endif
             dircache_disable();
         }