diff --git a/src/App.tsx b/src/App.tsx
index 8ef6d1a55f19..c5a82b0c582c 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -28,7 +28,6 @@ import {ModalProvider} from './components/Modal/Global/ModalContext';
 import NavigationBar from './components/NavigationBar';
 import OnyxListItemProvider from './components/OnyxListItemProvider';
 import PopoverContextProvider from './components/PopoverProvider';
-import {ProductTrainingContextProvider} from './components/ProductTrainingContext';
 import SafeArea from './components/SafeArea';
 import ScrollOffsetContextProvider from './components/ScrollOffsetContextProvider';
 import {SearchRouterContextProvider} from './components/Search/SearchRouter/SearchRouterContext';
@@ -125,7 +124,6 @@ function App() {
                                         KeyboardStateProvider,
                                         KeyboardDismissibleFlatListContextProvider,
                                         SearchRouterContextProvider,
-                                        ProductTrainingContextProvider,
                                         InputBlurContextProvider,
                                         FullScreenBlockingViewContextProvider,
                                         FullScreenLoaderContextProvider,
diff --git a/src/components/ProductTrainingContext/index.tsx b/src/components/ProductTrainingContext/index.tsx
index 100eb568e8dd..6499d3481827 100644
--- a/src/components/ProductTrainingContext/index.tsx
+++ b/src/components/ProductTrainingContext/index.tsx
@@ -47,11 +47,13 @@ type ProductTrainingContextConfig = {
     onShown?: () => void;
 };
 
-const ProductTrainingContext = createContext<ProductTrainingContextType>({
+const defaultProductTrainingContext: ProductTrainingContextType = {
     shouldRenderTooltip: () => false,
     registerTooltip: () => {},
     unregisterTooltip: () => {},
-});
+};
+
+const ProductTrainingContext = createContext<ProductTrainingContextType>(defaultProductTrainingContext);
 
 function ProductTrainingContextProvider({children}: ChildrenProps) {
     const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP);
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
index 96b635b29085..7728bb3395ce 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -11,6 +11,7 @@ import LockedAccountModalProvider from '@components/LockedAccountModalProvider';
 import OpenAppFailureModal from '@components/OpenAppFailureModal';
 import OptionsListContextProvider from '@components/OptionListContextProvider';
 import PriorityModeController from '@components/PriorityModeController';
+import {ProductTrainingContextProvider} from '@components/ProductTrainingContext';
 import {SearchContextProvider} from '@components/Search/SearchContext';
 import SearchRouterModal from '@components/Search/SearchRouter/SearchRouterModal';
 import SupportalPermissionDeniedModalProvider from '@components/SupportalPermissionDeniedModalProvider';
@@ -157,6 +158,7 @@ function AuthScreens() {
                         OptionsListContextProvider,
                         SidebarOrderedReportsContextProvider,
                         SearchContextProvider,
+                        ProductTrainingContextProvider,
                         LockedAccountModalProvider,
                         DelegateNoAccessModalProvider,
                         SupportalPermissionDeniedModalProvider,