diff --git a/apps/mail/components/create/email-composer.tsx b/apps/mail/components/create/email-composer.tsx
index 6abea8099..02636c17d 100644
--- a/apps/mail/components/create/email-composer.tsx
+++ b/apps/mail/components/create/email-composer.tsx
@@ -100,7 +100,8 @@ export function EmailComposer({
   const [isComposeOpen] = useQueryState('isComposeOpen');
   const { data: emailData } = useThread(threadId ?? null);
   const { data: session } = useSession();
-  const [draftId, setDraftId] = useState<string | null>(null);
+  const [urlDraftId] = useQueryState('draftId');
+  const [draftId, setDraftId] = useState<string | null>(urlDraftId ?? null);
   const [aiGeneratedMessage, setAiGeneratedMessage] = useState<string | null>(null);
   const [aiIsLoading, setAiIsLoading] = useState(false);
 
@@ -352,6 +353,12 @@ export function EmailComposer({
     }
   };
 
+  useEffect(() => {
+    if (urlDraftId !== draftId) {
+      setDraftId(urlDraftId ?? null);
+    }
+  }, [urlDraftId]);
+
   useEffect(() => {
     if (!hasUnsavedChanges) return;