diff --git a/native/redux/persist.js b/native/redux/persist.js
--- a/native/redux/persist.js
+++ b/native/redux/persist.js
@@ -1441,7 +1441,7 @@
       return handleReduxMigrationFailure(state);
     },
   ): any),
-  timeout: ((__DEV__ ? 0 : undefined): number | void),
+  timeout: ((__DEV__ ? 0 : 30000): number | void),
 };
 
 const codeVersion: number = commCoreModule.getCodeVersion();
diff --git a/web/redux/persist.js b/web/redux/persist.js
--- a/web/redux/persist.js
+++ b/web/redux/persist.js
@@ -629,6 +629,7 @@
   ): any),
   version: storeVersion,
   transforms: [messageStoreMessagesBlocklistTransform, keyserverStoreTransform],
+  timeout: ((isDev ? 0 : 30000): number | void),
 };
 
 export { persistConfig };