diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
index f180d931bf..ab2dbfedec 100644
--- a/src/stores/MessageComposerStore.js
+++ b/src/stores/MessageComposerStore.js
@@ -34,7 +34,8 @@ class MessageComposerStore {
         localStorage.setItem(this._getKey(roomId), JSON.stringify({
             editor_state: editorState.toJSON({
                 preserveSelection: true,
-                preserveHistory: true,
+                // XXX: re-hydrating history is not currently supported by fromJSON
+                // preserveHistory: true,
                 // XXX: this seems like a workaround for selection.isSet being based on anchorKey instead of anchorPath
                 preserveKeys: true,
             }),