diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 73a2a3c4b6..d1071a9e19 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -473,7 +473,7 @@ export default class MessagePanel extends React.Component {
     }
 
     get _roomHasPendingEdit() {
-        return localStorage.getItem(`mx_edit_room_${this.props.room.roomId}`);
+        return this.props.room && localStorage.getItem(`mx_edit_room_${this.props.room.roomId}`);
     }
 
     _getEventTiles() {