diff --git a/src/features/compose/components/compose-form.tsx b/src/features/compose/components/compose-form.tsx
index 6e0bda14f2..ead48ae107 100644
--- a/src/features/compose/components/compose-form.tsx
+++ b/src/features/compose/components/compose-form.tsx
@@ -100,7 +100,7 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
   const anyMedia = compose.media_attachments.size > 0;
 
   const [composeFocused, setComposeFocused] = useState(false);
-  const [text, setText] = useState('');
+  const [text, setText] = useState(compose.text);
 
   const firstRender = useRef(true);
   const formRef = useRef<HTMLDivElement>(null);