diff --git a/native/root.react.js b/native/root.react.js
--- a/native/root.react.js
+++ b/native/root.react.js
@@ -331,33 +331,33 @@
       <StaffContextProvider>
         <IdentityServiceContextProvider>
           <UserIdentityCacheProvider>
-            <TunnelbrokerProvider>
-              <IdentitySearchProvider>
-                <QRAuthProvider
-                  parseTunnelbrokerQRAuthMessage={
-                    parseTunnelbrokerQRAuthMessage
-                  }
-                  composeTunnelbrokerQRAuthMessage={
-                    composeTunnelbrokerQRAuthMessage
-                  }
-                  generateAESKey={generateQRAuthAESKey}
-                  performBackupRestore={performBackupRestore}
-                  onLogInError={handleSecondaryDeviceLogInError}
-                >
-                  <FeatureFlagsProvider>
-                    <NavContext.Provider value={navContext}>
-                      <RootContext.Provider value={rootContext}>
-                        <InputStateContainer>
-                          <MessageEditingContextProvider>
-                            <SafeAreaProvider
-                              initialMetrics={initialWindowMetrics}
-                            >
-                              <ActionSheetProvider>
-                                <ENSCacheProvider
-                                  ethersProvider={ethersProvider}
-                                  alchemyKey={alchemyKey}
+            <ENSCacheProvider
+              ethersProvider={ethersProvider}
+              alchemyKey={alchemyKey}
+            >
+              <NeynarClientProvider apiKey={neynarKey}>
+                <TunnelbrokerProvider>
+                  <IdentitySearchProvider>
+                    <QRAuthProvider
+                      parseTunnelbrokerQRAuthMessage={
+                        parseTunnelbrokerQRAuthMessage
+                      }
+                      composeTunnelbrokerQRAuthMessage={
+                        composeTunnelbrokerQRAuthMessage
+                      }
+                      generateAESKey={generateQRAuthAESKey}
+                      performBackupRestore={performBackupRestore}
+                      onLogInError={handleSecondaryDeviceLogInError}
+                    >
+                      <FeatureFlagsProvider>
+                        <NavContext.Provider value={navContext}>
+                          <RootContext.Provider value={rootContext}>
+                            <InputStateContainer>
+                              <MessageEditingContextProvider>
+                                <SafeAreaProvider
+                                  initialMetrics={initialWindowMetrics}
                                 >
-                                  <NeynarClientProvider apiKey={neynarKey}>
+                                  <ActionSheetProvider>
                                     <MediaCacheProvider
                                       persistence={filesystemMediaCache}
                                     >
@@ -398,18 +398,18 @@
                                         </NativeEditThreadAvatarProvider>
                                       </EditUserAvatarProvider>
                                     </MediaCacheProvider>
-                                  </NeynarClientProvider>
-                                </ENSCacheProvider>
-                              </ActionSheetProvider>
-                            </SafeAreaProvider>
-                          </MessageEditingContextProvider>
-                        </InputStateContainer>
-                      </RootContext.Provider>
-                    </NavContext.Provider>
-                  </FeatureFlagsProvider>
-                </QRAuthProvider>
-              </IdentitySearchProvider>
-            </TunnelbrokerProvider>
+                                  </ActionSheetProvider>
+                                </SafeAreaProvider>
+                              </MessageEditingContextProvider>
+                            </InputStateContainer>
+                          </RootContext.Provider>
+                        </NavContext.Provider>
+                      </FeatureFlagsProvider>
+                    </QRAuthProvider>
+                  </IdentitySearchProvider>
+                </TunnelbrokerProvider>
+              </NeynarClientProvider>
+            </ENSCacheProvider>
           </UserIdentityCacheProvider>
         </IdentityServiceContextProvider>
       </StaffContextProvider>
diff --git a/web/app.react.js b/web/app.react.js
--- a/web/app.react.js
+++ b/web/app.react.js
@@ -238,32 +238,28 @@
       <DndProvider backend={HTML5Backend}>
         <EditModalProvider>
           <MenuProvider>
-            <AlchemyENSCacheProvider>
-              <NeynarClientProvider apiKey={process.env.COMM_NEYNAR_KEY}>
-                <TooltipProvider>
-                  <MessageSearchStateProvider>
-                    <ChatMentionContextProvider>
-                      <FocusHandler />
-                      <VisibilityHandler />
-                      <PolicyAcknowledgmentHandler />
-                      <PushNotificationsHandler />
-                      <InviteLinkHandler />
-                      <InviteLinksRefresher />
-                      <CommunitiesRefresher />
-                      <MinVersionHandler />
-                      <PlatformDetailsSynchronizer />
-                      <LogOutIfMissingCSATHandler />
-                      <UserInfosHandler />
-                      <TunnelbrokerDeviceTokenHandler />
-                      <FarcasterDataHandler />
-                      <AutoJoinCommunityHandler />
-                      <DMActivityHandler />
-                      {content}
-                    </ChatMentionContextProvider>
-                  </MessageSearchStateProvider>
-                </TooltipProvider>
-              </NeynarClientProvider>
-            </AlchemyENSCacheProvider>
+            <TooltipProvider>
+              <MessageSearchStateProvider>
+                <ChatMentionContextProvider>
+                  <FocusHandler />
+                  <VisibilityHandler />
+                  <PolicyAcknowledgmentHandler />
+                  <PushNotificationsHandler />
+                  <InviteLinkHandler />
+                  <InviteLinksRefresher />
+                  <CommunitiesRefresher />
+                  <MinVersionHandler />
+                  <PlatformDetailsSynchronizer />
+                  <LogOutIfMissingCSATHandler />
+                  <UserInfosHandler />
+                  <TunnelbrokerDeviceTokenHandler />
+                  <FarcasterDataHandler />
+                  <AutoJoinCommunityHandler />
+                  <DMActivityHandler />
+                  {content}
+                </ChatMentionContextProvider>
+              </MessageSearchStateProvider>
+            </TooltipProvider>
           </MenuProvider>
         </EditModalProvider>
       </DndProvider>
@@ -556,34 +552,40 @@
 
     return (
       <AppThemeWrapper>
-        <TunnelbrokerProvider
-          shouldBeClosed={lockStatus !== 'acquired'}
-          onClose={releaseLockOrAbortRequest}
-          secondaryTunnelbrokerConnection={secondaryTunnelbrokerConnection}
-        >
-          <BadgeHandler />
-          <IdentitySearchProvider>
-            <QRAuthProvider
-              parseTunnelbrokerQRAuthMessage={parseTunnelbrokerQRAuthMessage}
-              composeTunnelbrokerQRAuthMessage={
-                composeTunnelbrokerQRAuthMessage
-              }
-              generateAESKey={generateQRAuthAESKey}
-              onLogInError={handleSecondaryDeviceLogInError}
+        <AlchemyENSCacheProvider>
+          <NeynarClientProvider apiKey={process.env.COMM_NEYNAR_KEY}>
+            <TunnelbrokerProvider
+              shouldBeClosed={lockStatus !== 'acquired'}
+              onClose={releaseLockOrAbortRequest}
+              secondaryTunnelbrokerConnection={secondaryTunnelbrokerConnection}
             >
-              <App
-                {...props}
-                navInfo={navInfo}
-                entriesLoadingStatus={entriesLoadingStatus}
-                loggedIn={loggedIn}
-                activeThreadCurrentlyUnread={activeThreadCurrentlyUnread}
-                dispatch={dispatch}
-                modals={modals}
-              />
-            </QRAuthProvider>
-            <DBOpsHandler />
-          </IdentitySearchProvider>
-        </TunnelbrokerProvider>
+              <BadgeHandler />
+              <IdentitySearchProvider>
+                <QRAuthProvider
+                  parseTunnelbrokerQRAuthMessage={
+                    parseTunnelbrokerQRAuthMessage
+                  }
+                  composeTunnelbrokerQRAuthMessage={
+                    composeTunnelbrokerQRAuthMessage
+                  }
+                  generateAESKey={generateQRAuthAESKey}
+                  onLogInError={handleSecondaryDeviceLogInError}
+                >
+                  <App
+                    {...props}
+                    navInfo={navInfo}
+                    entriesLoadingStatus={entriesLoadingStatus}
+                    loggedIn={loggedIn}
+                    activeThreadCurrentlyUnread={activeThreadCurrentlyUnread}
+                    dispatch={dispatch}
+                    modals={modals}
+                  />
+                </QRAuthProvider>
+                <DBOpsHandler />
+              </IdentitySearchProvider>
+            </TunnelbrokerProvider>
+          </NeynarClientProvider>
+        </AlchemyENSCacheProvider>
       </AppThemeWrapper>
     );
   },