diff --git a/src/frontend/src/pages/MainPage/components/flows/index.tsx b/src/frontend/src/pages/MainPage/components/flows/index.tsx
index 50eca596d..ec139bee9 100644
--- a/src/frontend/src/pages/MainPage/components/flows/index.tsx
+++ b/src/frontend/src/pages/MainPage/components/flows/index.tsx
@@ -5,10 +5,10 @@ import CardsWrapComponent from "../../../../components/cardsWrapComponent";
 import IconComponent from "../../../../components/genericIconComponent";
 import { Button } from "../../../../components/ui/button";
 import { alertContext } from "../../../../contexts/alertContext";
-import { TabsContext } from "../../../../contexts/tabsContext";
+import { FlowsContext } from "../../../../contexts/flowsContext";
 
 export default function FlowsComponent() {
-  const { uploadFlow, removeFlow, flows, isLoading } = useContext(TabsContext);
+  const { uploadFlow, removeFlow, flows, isLoading } = useContext(FlowsContext);
   const { setErrorData } = useContext(alertContext);
 
   const onFileDrop = (e) => {
diff --git a/src/frontend/src/pages/StorePage/components/market-card.tsx b/src/frontend/src/pages/StorePage/components/market-card.tsx
index 3079db414..d94706b4e 100644
--- a/src/frontend/src/pages/StorePage/components/market-card.tsx
+++ b/src/frontend/src/pages/StorePage/components/market-card.tsx
@@ -12,8 +12,8 @@ import {
   CardTitle,
 } from "../../../components/ui/card";
 import { alertContext } from "../../../contexts/alertContext";
+import { FlowsContext } from "../../../contexts/flowsContext";
 import { StoreContext } from "../../../contexts/storeContext";
-import { TabsContext } from "../../../contexts/tabsContext";
 import {
   getComponent,
   postLikeComponent,
@@ -38,7 +38,7 @@ export const MarketCardComponent = ({
   const [added, setAdded] = useState(savedFlows.has(data.id) ? true : false);
   const [installed, setInstalled] = useState(false);
   const [loading, setLoading] = useState(false);
-  const { addFlow } = useContext(TabsContext);
+  const { addFlow } = useContext(FlowsContext);
   const [loadingLike, setLoadingLike] = useState(false);
   const { setSuccessData, setErrorData } = useContext(alertContext);
   const [liked_by_user, setLiked_by_user] = useState(data.liked_by_user);
diff --git a/src/frontend/src/pages/StorePage/index.tsx b/src/frontend/src/pages/StorePage/index.tsx
index a6abc3b07..aaa7f5743 100644
--- a/src/frontend/src/pages/StorePage/index.tsx
+++ b/src/frontend/src/pages/StorePage/index.tsx
@@ -16,17 +16,12 @@ import {
 } from "../../components/ui/select";
 import { alertContext } from "../../contexts/alertContext";
 import { StoreContext } from "../../contexts/storeContext";
-import { TabsContext } from "../../contexts/tabsContext";
 import { getStoreComponents, getStoreTags } from "../../controllers/API";
 import StoreApiKeyModal from "../../modals/StoreApiKeyModal";
 import { storeComponent } from "../../types/store";
 import { cn } from "../../utils/utils";
 import { MarketCardComponent } from "./components/market-card";
 export default function StorePage(): JSX.Element {
-  const { setTabId } = useContext(TabsContext);
-  useEffect(() => {
-    setTabId("");
-  }, []);
   const { errorApiKey, hasApiKey } = useContext(StoreContext);
   const { setErrorData } = useContext(alertContext);
   const [loading, setLoading] = useState(true);