diff --git a/invokeai/frontend/web/src/app/components/App.tsx b/invokeai/frontend/web/src/app/components/App.tsx
index 1c1af39a00..bfe8e231c6 100644
--- a/invokeai/frontend/web/src/app/components/App.tsx
+++ b/invokeai/frontend/web/src/app/components/App.tsx
@@ -1,8 +1,11 @@
 import { Box } from '@invoke-ai/ui-library';
+import { useStore } from '@nanostores/react';
 import { GlobalHookIsolator } from 'app/components/GlobalHookIsolator';
 import { GlobalModalIsolator } from 'app/components/GlobalModalIsolator';
 import { clearStorage } from 'app/store/enhancers/reduxRemember/driver';
+import Loading from 'common/components/Loading/Loading';
 import { AppContent } from 'features/ui/components/AppContent';
+import { navigationApi } from 'features/ui/layouts/navigation-api';
 import { memo } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 
@@ -16,11 +19,12 @@ const errorBoundaryOnReset = () => {
 };
 
 const App = () => {
+  const isNavigationAPIConnected = useStore(navigationApi.$isConnected);
   return (
     <ThemeLocaleProvider>
       <ErrorBoundary onReset={errorBoundaryOnReset} FallbackComponent={AppErrorBoundaryFallback}>
         <Box id="invoke-app-wrapper" w="100dvw" h="100dvh" position="relative" overflow="hidden">
-          <AppContent />
+          {isNavigationAPIConnected ? <AppContent /> : <Loading />}
         </Box>
         <GlobalHookIsolator />
         <GlobalModalIsolator />
diff --git a/invokeai/frontend/web/src/app/components/GlobalHookIsolator.tsx b/invokeai/frontend/web/src/app/components/GlobalHookIsolator.tsx
index 77e8412daa..b8b11287c1 100644
--- a/invokeai/frontend/web/src/app/components/GlobalHookIsolator.tsx
+++ b/invokeai/frontend/web/src/app/components/GlobalHookIsolator.tsx
@@ -34,6 +34,7 @@ export const GlobalHookIsolator = memo(() => {
   const dispatch = useAppDispatch();
 
   // singleton!
+  useNavigationApi();
   useReadinessWatcher();
   useSocketIO();
   useGlobalModifiersInit();
@@ -41,7 +42,6 @@ export const GlobalHookIsolator = memo(() => {
   useGetOpenAPISchemaQuery();
   useSyncLoggingConfig();
   useCloseChakraTooltipsOnDragFix();
-  useNavigationApi();
   useDndMonitor();
   useSyncNodeErrors();
   useSyncLangDirection();