diff --git a/src/global/cache.ts b/src/global/cache.ts
index 573c24056..2f6294f68 100644
--- a/src/global/cache.ts
+++ b/src/global/cache.ts
@@ -72,7 +72,7 @@ function readCache(initialState: GlobalState) {
   }
 
   if (cached) {
-    // Pre-fill defaults for new settings which may be missing in older cache
+    // Pre-fill defaults in nested objects which may be missing in older cache
     cached.settings.byKey = {
       ...initialState.settings.byKey,
       ...cached.settings.byKey,
@@ -81,6 +81,10 @@ function readCache(initialState: GlobalState) {
       ...initialState.settings.themes,
       ...cached.settings.themes,
     };
+    cached.chatFolders = {
+      ...initialState.chatFolders,
+      ...cached.chatFolders,
+    };
   }
 
   return {