diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index dd87654438..46999bb793 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -182,8 +182,7 @@ export default class EditMessageComposer extends React.Component {
     }
 
     get _shouldSaveStoredEditorState() {
-        return localStorage.getItem(`mx_edit_state_${this.props.editState.getEvent().getRoomId()}
-        _${this.props.editState.getEvent().event.event_id}`) !== null;
+        return localStorage.getItem(this._editorStateKey) !== null;
     }
 
     _restoreStoredEditorState(partCreator) {