diff --git a/packages/twenty-front/src/modules/workflow/hooks/useEffectiveDraftVersionId.ts b/packages/twenty-front/src/modules/workflow/hooks/useEffectiveDraftVersionId.ts
index 689ea2aeed..03bbd895bb 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useEffectiveDraftVersionId.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useEffectiveDraftVersionId.ts
@@ -63,7 +63,13 @@ export const useEffectiveDraftVersionId = (
     return { effectiveDraftId: previouslyKnownDraftId, lastDiscardedDraftId };
   }
 
-  setLastDiscardedDraftId(previouslyKnownDraftId);
+  const wasDiscarded =
+    isDefined(cachedDraft) && isDefined(cachedDraft.deletedAt);
+
+  if (wasDiscarded) {
+    setLastDiscardedDraftId(previouslyKnownDraftId);
+  }
+
   setPreviouslyKnownDraftId(undefined);
 
   return { effectiveDraftId: undefined, lastDiscardedDraftId };