diff --git a/src/components/Editor/Editor.tsx b/src/components/Editor/Editor.tsx
index ee65ddb9..9117dcdd 100644
--- a/src/components/Editor/Editor.tsx
+++ b/src/components/Editor/Editor.tsx
@@ -216,7 +216,8 @@ export const Editor = (props: EditorProps) => {
       }),
       TrailingNode,
       Article
-    ]
+    ],
+    content: props.initialContent ?? null
   }))
 
   onMount(() => {
diff --git a/src/components/Views/Edit.tsx b/src/components/Views/Edit.tsx
index f9ff0db8..04350ee0 100644
--- a/src/components/Views/Edit.tsx
+++ b/src/components/Views/Edit.tsx
@@ -444,8 +444,8 @@ export const EditView = (props: Props) => {
             </div>
 
             <Editor
-              shoutId={props.shout.id}
-              initialContent={props.shout.body}
+              shoutId={form.shoutId}
+              initialContent={form.body}
               onChange={(body) => setForm('body', body)}
             />
           </div>