diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/useWorkflowsWithCurrentVersions.ts b/packages/twenty-front/src/modules/command-menu-item/hooks/useWorkflowsWithCurrentVersions.ts
index ab77ec02d4c..d9d7272ddeb 100644
--- a/packages/twenty-front/src/modules/command-menu-item/hooks/useWorkflowsWithCurrentVersions.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/hooks/useWorkflowsWithCurrentVersions.ts
@@ -9,11 +9,11 @@ import {
 } from '@/workflow/types/Workflow';
 
 const getCurrentVersionId = (workflow: Workflow): string | undefined => {
-  const draftVersion = workflow.versions.find(
-    (version) => version.status === 'DRAFT',
-  );
+  const versions = workflow.versions ?? [];
 
-  const sortedVersions = workflow.versions.toSorted((a, b) =>
+  const draftVersion = versions.find((version) => version.status === 'DRAFT');
+
+  const sortedVersions = versions.toSorted((a, b) =>
     a.createdAt > b.createdAt ? -1 : 1,
   );
 
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowWithCurrentVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowWithCurrentVersion.ts
index 203d8ba032f..825ed04ba5e 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowWithCurrentVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowWithCurrentVersion.ts
@@ -60,15 +60,17 @@ export const useWorkflowWithCurrentVersion = (
     refetchWorkflow,
   ]);
 
-  const draftVersion = workflow?.versions.find(
+  const workflowVersions = workflow?.versions ?? [];
+
+  const draftVersion = workflowVersions.find(
     (workflowVersion) => workflowVersion.status === 'DRAFT',
   );
 
-  const workflowVersions = [...(workflow?.versions ?? [])];
+  const sortedWorkflowVersions = [...workflowVersions];
 
-  workflowVersions.sort((a, b) => (a.createdAt > b.createdAt ? -1 : 1));
+  sortedWorkflowVersions.sort((a, b) => (a.createdAt > b.createdAt ? -1 : 1));
 
-  const latestVersion = workflowVersions[0];
+  const latestVersion = sortedWorkflowVersions[0];
 
   const currentVersionWithoutSteps = draftVersion ?? latestVersion;