diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 6993fd8f7d..d9bd8d2892 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -74,7 +74,7 @@ export default class MessageComposer extends React.Component {
     }
 
     onPageUnload(event) {
-        if (this.messageComposerInput) {
+        if (this.messageComposerInput && this.messageComposerInput.sentHistory) {
             this.messageComposerInput.sentHistory.saveLastTextEntry();
         }
     }