diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
index 0b22057f3c..f180d931bf 100644
--- a/src/stores/MessageComposerStore.js
+++ b/src/stores/MessageComposerStore.js
@@ -32,7 +32,12 @@ class MessageComposerStore {
 
     setEditorState(roomId: string, editorState: Value, richText: boolean) {
         localStorage.setItem(this._getKey(roomId), JSON.stringify({
-            editor_state: editorState,
+            editor_state: editorState.toJSON({
+                preserveSelection: true,
+                preserveHistory: true,
+                // XXX: this seems like a workaround for selection.isSet being based on anchorKey instead of anchorPath
+                preserveKeys: true,
+            }),
             rich_text: richText,
         }));
     }