diff --git a/src/pages/approval-workflows/create.tsx b/src/pages/approval-workflows/create.tsx
index 571dacf3..1e939d0b 100644
--- a/src/pages/approval-workflows/create.tsx
+++ b/src/pages/approval-workflows/create.tsx
@@ -219,13 +219,16 @@ export default function Home({ user, allConfiguredWorkflows, userEntitiesWithLab
             id: newId,
             steps: workflowToClone.steps.map(step => ({
                 ...step,
-                assignees: step.firstStep ? [] : [...step.assignees], // we can't have more than one form intaker per teacher per entity
+                assignees: step.firstStep ? [null] : [...step.assignees], // we can't have more than one form intaker per teacher per entity
             })),
         };
     
-        setWorkflows(prev => [...prev, clonedWorkflow]);
-    
-        handleSelectWorkflow(newId);
+        setWorkflows(prev => {
+            const updatedWorkflows = [...prev, clonedWorkflow];
+            setSelectedWorkflowId(newId);
+            setEntityId(clonedWorkflow.entityId || null);
+            return updatedWorkflows;
+        });
     };
 
     const handleDeleteWorkflow = (id: string) => {