diff --git a/frontend/src/components/visual-editor/v2/Diagrams.tsx b/frontend/src/components/visual-editor/v2/Diagrams.tsx
index 410b9838..4fa0a934 100644
--- a/frontend/src/components/visual-editor/v2/Diagrams.tsx
+++ b/frontend/src/components/visual-editor/v2/Diagrams.tsx
@@ -189,7 +189,8 @@ const Diagrams = () => {
   }, []);
 
   useEffect(() => {
-    setSelectedCategoryId(flowId || "");
+    if (flowId) setSelectedCategoryId(flowId);
+    else if (categories?.length) setSelectedCategoryId(categories[0].id);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [flowId]);