diff --git a/app/components/Nav/Main/index.js b/app/components/Nav/Main/index.js
index 8d463aae71b..0ff9ee33f51 100644
--- a/app/components/Nav/Main/index.js
+++ b/app/components/Nav/Main/index.js
@@ -82,6 +82,7 @@ import {
 } from '../../../util/transaction-controller';
 import isNetworkUiRedesignEnabled from '../../../util/networks/isNetworkUiRedesignEnabled';
 import { useConnectionHandler } from '../../../util/navigation/useConnectionHandler';
+import { AssetPollingProvider } from '../../hooks/AssetPolling/AssetPollingProvider';
 
 const Stack = createStackNavigator();
 
@@ -362,35 +363,37 @@ const Main = (props) => {
 
   return (
     <React.Fragment>
-      <View style={styles.flex}>
-        {!forceReload ? (
-          <MainNavigator navigation={props.navigation} />
-        ) : (
-          renderLoader()
-        )}
-        <GlobalAlert />
-        <FadeOutOverlay />
-        <Notification navigation={props.navigation} />
-        <RampOrders />
-        <SwapsLiveness />
-        <BackupAlert
-          onDismiss={toggleRemindLater}
-          navigation={props.navigation}
-        />
-        {renderDeprecatedNetworkAlert(
-          props.chainId,
-          props.backUpSeedphraseVisible,
-        )}
-        <SkipAccountSecurityModal
-          modalVisible={showRemindLaterModal}
-          onCancel={skipAccountModalSecureNow}
-          onConfirm={skipAccountModalSkip}
-          skipCheckbox={skipCheckbox}
-          toggleSkipCheckbox={toggleSkipCheckbox}
-        />
-        <ProtectYourWalletModal navigation={props.navigation} />
-        <RootRPCMethodsUI navigation={props.navigation} />
-      </View>
+      <AssetPollingProvider>
+        <View style={styles.flex}>
+          {!forceReload ? (
+            <MainNavigator navigation={props.navigation} />
+          ) : (
+            renderLoader()
+          )}
+          <GlobalAlert />
+          <FadeOutOverlay />
+          <Notification navigation={props.navigation} />
+          <RampOrders />
+          <SwapsLiveness />
+          <BackupAlert
+            onDismiss={toggleRemindLater}
+            navigation={props.navigation}
+          />
+          {renderDeprecatedNetworkAlert(
+            props.chainId,
+            props.backUpSeedphraseVisible,
+          )}
+          <SkipAccountSecurityModal
+            modalVisible={showRemindLaterModal}
+            onCancel={skipAccountModalSecureNow}
+            onConfirm={skipAccountModalSkip}
+            skipCheckbox={skipCheckbox}
+            toggleSkipCheckbox={toggleSkipCheckbox}
+          />
+          <ProtectYourWalletModal navigation={props.navigation} />
+          <RootRPCMethodsUI navigation={props.navigation} />
+        </View>
+      </AssetPollingProvider>
     </React.Fragment>
   );
 };
diff --git a/app/components/Views/Root/index.js b/app/components/Views/Root/index.js
index 05a52cb033b..7ffa81485d3 100644
--- a/app/components/Views/Root/index.js
+++ b/app/components/Views/Root/index.js
@@ -12,7 +12,6 @@ import { useAppTheme, ThemeContext } from '../../../util/theme';
 import { ToastContextWrapper } from '../../../component-library/components/Toast';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import { isTest } from '../../../util/test/utils';
-import { AssetPollingProvider } from '../../hooks/AssetPolling/AssetPollingProvider';
 
 /**
  * Top level of the component hierarchy
@@ -86,11 +85,9 @@ const ConnectedRoot = () => {
     <SafeAreaProvider>
       <ThemeContext.Provider value={theme}>
         <ToastContextWrapper>
-          <AssetPollingProvider>
-            <ErrorBoundary view="Root">
-              <App />
-            </ErrorBoundary>
-          </AssetPollingProvider>
+          <ErrorBoundary view="Root">
+            <App />
+          </ErrorBoundary>
         </ToastContextWrapper>
       </ThemeContext.Provider>
     </SafeAreaProvider>