diff --git a/native/data/sqlite-context-provider.js b/native/data/sqlite-context-provider.js
index 6680e075a..c9fd22c83 100644
--- a/native/data/sqlite-context-provider.js
+++ b/native/data/sqlite-context-provider.js
@@ -1,109 +1,111 @@
 // @flow
 
 import * as React from 'react';
 import { Alert } from 'react-native';
 import ExitApp from 'react-native-exit-app';
 import { useDispatch } from 'react-redux';
 
 import { setMessageStoreMessages } from 'lib/actions/message-actions.js';
 import { setThreadStoreActionType } from 'lib/actions/thread-actions';
 import { logInActionSources } from 'lib/types/account-types';
 import { fetchNewCookieFromNativeCredentials } from 'lib/utils/action-utils';
 import { getMessageForException } from 'lib/utils/errors';
 import { convertClientDBThreadInfosToRawThreadInfos } from 'lib/utils/thread-ops-utils';
 
 import { commCoreModule } from '../native-modules';
 import { useSelector } from '../redux/redux-utils';
 import { useStaffCanSee } from '../utils/staff-utils';
 import { SQLiteContext } from './sqlite-context';
 
 type Props = {
   +children: React.Node,
 };
 
 function SQLiteContextProvider(props: Props): React.Node {
   const [storeLoaded, setStoreLoaded] = React.useState<boolean>(false);
 
   const dispatch = useDispatch();
   const rehydrateConcluded = useSelector(
     state => !!(state._persist && state._persist.rehydrated),
   );
   const cookie = useSelector(state => state.cookie);
   const urlPrefix = useSelector(state => state.urlPrefix);
   const staffCanSee = useStaffCanSee();
 
   React.useEffect(() => {
     if (storeLoaded || !rehydrateConcluded) {
       return;
     }
     (async () => {
       try {
-        const threads = await commCoreModule.getAllThreads();
+        const [threads, messages] = await Promise.all([
+          commCoreModule.getAllThreads(),
+          commCoreModule.getAllMessages(),
+        ]);
         const threadInfosFromDB = convertClientDBThreadInfosToRawThreadInfos(
           threads,
         );
         dispatch({
           type: setThreadStoreActionType,
           payload: { threadInfos: threadInfosFromDB },
         });
-        const messages = await commCoreModule.getAllMessages();
         dispatch({
           type: setMessageStoreMessages,
           payload: messages,
         });
         setStoreLoaded(true);
       } catch (setStoreException) {
         if (staffCanSee) {
           Alert.alert(
             `Error setting threadStore or messageStore: ${
               getMessageForException(setStoreException) ??
               '{no exception message}'
             }`,
           );
         }
         try {
           await fetchNewCookieFromNativeCredentials(
             dispatch,
             cookie,
             urlPrefix,
             logInActionSources.sqliteLoadFailure,
           );
           setStoreLoaded(true);
         } catch (fetchCookieException) {
           if (staffCanSee) {
             Alert.alert(
               `Error fetching new cookie from native credentials: ${
                 getMessageForException(fetchCookieException) ??
                 '{no exception message}'
               }. Please kill the app.`,
             );
           } else {
             ExitApp.exitApp();
           }
         }
       }
     })();
   }, [
     cookie,
     dispatch,
     rehydrateConcluded,
     staffCanSee,
     storeLoaded,
     urlPrefix,
   ]);
 
   const contextValue = React.useMemo(
     () => ({
       storeLoaded,
     }),
     [storeLoaded],
   );
 
   return (
     <SQLiteContext.Provider value={contextValue}>
       {props.children}
     </SQLiteContext.Provider>
   );
 }
 
 export { SQLiteContextProvider };