diff --git a/src/controllers/organisms/RoomView.js b/src/controllers/organisms/RoomView.js
index 5af8220bc3..c305a9c956 100644
--- a/src/controllers/organisms/RoomView.js
+++ b/src/controllers/organisms/RoomView.js
@@ -619,7 +619,7 @@ module.exports = {
         for (var i = this.state.room.timeline.length-1; i >= 0; --i) {
             var ev = this.state.room.timeline[i];
 
-            if (ev.sender.userId == MatrixClientPeg.get().credentials.userId) {
+            if (ev.sender && ev.sender.userId == MatrixClientPeg.get().credentials.userId) {
                 continue;
             }