diff --git a/src/frontend/src/contexts/storeContext.tsx b/src/frontend/src/contexts/storeContext.tsx
index c1992f3f6..8a60d4a63 100644
--- a/src/frontend/src/contexts/storeContext.tsx
+++ b/src/frontend/src/contexts/storeContext.tsx
@@ -1,4 +1,4 @@
-import { createContext, useState } from "react";
+import { createContext, useEffect, useState } from "react";
 import { checkHasStore } from "../controllers/API";
 import { storeContextType } from "../types/contexts/store";
 
@@ -8,7 +8,7 @@ const initialValue = {
   setSavedFlows: () => {},
   hasStore: true,
   setHasStore: () => {},
-  hasApiKey: true,
+  hasApiKey: false,
   setHasApiKey: () => {},
 };
 
@@ -18,12 +18,24 @@ export function StoreProvider({ children }) {
   const [savedFlows, setSavedFlows] = useState<Set<string>>(new Set());
 
   const [hasStore, setHasStore] = useState(true);
-  const [hasApiKey, setHasApiKey] = useState(true);
+  const [hasApiKey, setHasApiKey] = useState(false);
+  const [storeChecked, setStoreChecked] = useState(false);
 
-  checkHasStore().then((res) => {
-    setHasStore(res["enabled"]);
-    setHasApiKey(res["has_api_key"]);
-  });
+  useEffect(() => {
+    const fetchStoreData = async () => {
+      try {
+        if (storeChecked) return;
+        const res = await checkHasStore();
+        setHasStore(res?.enabled ?? false);
+        setHasApiKey(res?.has_api_key ?? false);
+        setStoreChecked(true);
+      } catch (e) {
+        console.log(e);
+      }
+    };
+
+    fetchStoreData();
+  }, []);
 
   return (
     <StoreContext.Provider
diff --git a/src/frontend/src/controllers/API/index.ts b/src/frontend/src/controllers/API/index.ts
index f38a3eefd..86e3d566a 100644
--- a/src/frontend/src/controllers/API/index.ts
+++ b/src/frontend/src/controllers/API/index.ts
@@ -732,7 +732,7 @@ export async function searchComponent(
 export async function checkHasStore() {
   try {
     const res = await api.get(`${BASE_URL_API}store/check/`);
-    if (res.status === 200) {
+    if (res?.status === 200) {
       return res.data;
     }
   } catch (error) {
diff --git a/src/frontend/src/pages/StorePage/index.tsx b/src/frontend/src/pages/StorePage/index.tsx
index ee7958674..929dacd77 100644
--- a/src/frontend/src/pages/StorePage/index.tsx
+++ b/src/frontend/src/pages/StorePage/index.tsx
@@ -74,8 +74,8 @@ export default function StorePage(): JSX.Element {
     let results = data?.results ?? [];
     results.forEach((flow) => {
       savedIds.add(flow.id);
-    }); /*
-    setSavedFlows(savedIds); */
+    });
+    setSavedFlows(savedIds);
     setErrorApiKey(false);
     setLoading(false);
   }