diff --git a/src/frontend/src/contexts/tabsContext.tsx b/src/frontend/src/contexts/tabsContext.tsx
index 4196f269c..1fc9e8ab9 100644
--- a/src/frontend/src/contexts/tabsContext.tsx
+++ b/src/frontend/src/contexts/tabsContext.tsx
@@ -146,19 +146,21 @@ export function TabsProvider({ children }: { children: ReactNode }) {
           return;
         }
         if (flow.data && flow.is_component) {
-          storeComponents[(flow.data.nodes[0].data as NodeDataType).type] = (
-            flow.data.nodes[0].data as NodeDataType
-          ).node!;
+          storeComponents[(flow.data.nodes[0].data as NodeDataType).type] =
+            _.cloneDeep((flow.data.nodes[0].data as NodeDataType).node!);
+          return;
         }
-        setData((prev) => {
-          let newData = _.cloneDeep(prev);
-          Object.keys(storeComponents).forEach((key) => {
-            newData["custom_components"][key] = storeComponents[key];
-          });
-          return newData;
-        });
         processDataFromFlow(flow, false);
-      } catch (e) {}
+      } catch (e) {
+        console.log(e);
+      }
+    });
+    setData((prev) => {
+      let newData = _.cloneDeep(prev);
+      Object.keys(storeComponents).forEach((key) => {
+        newData["custom_components"][key] = storeComponents[key];
+      });
+      return newData;
     });
   }
 
diff --git a/src/frontend/src/pages/MainPage/index.tsx b/src/frontend/src/pages/MainPage/index.tsx
index 7ee00f5c9..441363a27 100644
--- a/src/frontend/src/pages/MainPage/index.tsx
+++ b/src/frontend/src/pages/MainPage/index.tsx
@@ -145,31 +145,33 @@ export default function HomePage(): JSX.Element {
                   <SkeletonCardComponent />
                 </>
               ) : (
-                flows.map((flow, idx) => (
-                  <CardComponent
-                    key={idx}
-                    flow={flow}
-                    id={flow.id}
-                    button={
-                      <Link to={"/flow/" + flow.id}>
-                        <Button
-                          variant="outline"
-                          size="sm"
-                          className="whitespace-nowrap "
-                        >
-                          <IconComponent
-                            name="ExternalLink"
-                            className="main-page-nav-button"
-                          />
-                          Edit Flow
-                        </Button>
-                      </Link>
-                    }
-                    onDelete={() => {
-                      removeFlow(flow.id);
-                    }}
-                  />
-                ))
+                flows
+                  .filter((flow) => !flow.is_component)
+                  .map((flow, idx) => (
+                    <CardComponent
+                      key={idx}
+                      flow={flow}
+                      id={flow.id}
+                      button={
+                        <Link to={"/flow/" + flow.id}>
+                          <Button
+                            variant="outline"
+                            size="sm"
+                            className="whitespace-nowrap "
+                          >
+                            <IconComponent
+                              name="ExternalLink"
+                              className="main-page-nav-button"
+                            />
+                            Edit Flow
+                          </Button>
+                        </Link>
+                      }
+                      onDelete={() => {
+                        removeFlow(flow.id);
+                      }}
+                    />
+                  ))
               )}
             </div>
           )}