diff --git a/src/frontend/src/controllers/API/queries/flows/use-get-basic-examples.ts b/src/frontend/src/controllers/API/queries/flows/use-get-basic-examples.ts
index d6cc3dc55..45066c22f 100644
--- a/src/frontend/src/controllers/API/queries/flows/use-get-basic-examples.ts
+++ b/src/frontend/src/controllers/API/queries/flows/use-get-basic-examples.ts
@@ -26,6 +26,7 @@ export const useGetBasicExamplesQuery: useQueryFunctionType<
 
   const queryResult = query(["useGetBasicExamplesQuery"], responseFn, {
     ...options,
+    retry: 3,
   });
 
   return queryResult;
diff --git a/src/frontend/src/pages/AppInitPage/index.tsx b/src/frontend/src/pages/AppInitPage/index.tsx
index 2eb8b2976..be43fa5b9 100644
--- a/src/frontend/src/pages/AppInitPage/index.tsx
+++ b/src/frontend/src/pages/AppInitPage/index.tsx
@@ -26,10 +26,13 @@ export function AppInitPage() {
   useGetConfig({ enabled: isFetched });
   const { isFetched: typesLoaded } = useGetTypes({ enabled: isFetched });
   useGetGlobalVariables({ enabled: typesLoaded });
-  useGetBasicExamplesQuery({ enabled: typesLoaded });
   useGetTagsQuery({ enabled: typesLoaded });
-
-  useGetFoldersQuery({ enabled: typesLoaded });
+  useGetFoldersQuery({
+    enabled: typesLoaded,
+  });
+  const { isFetched: isExamplesFetched } = useGetBasicExamplesQuery({
+    enabled: typesLoaded,
+  });
 
   useEffect(() => {
     if (isFetched) {
@@ -49,11 +52,13 @@ export function AppInitPage() {
     //need parent component with width and height
     <>
       {isLoaded ? (
-        (isLoading || !isFetched || !typesLoaded) && <LoadingPage overlay />
+        (isLoading || !isFetched || !isExamplesFetched || !typesLoaded) && (
+          <LoadingPage overlay />
+        )
       ) : (
         <CustomLoadingPage />
       )}
-      {isFetched && typesLoaded && <Outlet />}
+      {isFetched && isExamplesFetched && typesLoaded && <Outlet />}
     </>
   );
 }