diff --git a/lib/models/room.js b/lib/models/room.js
index 724ac559f..9ee1184f4 100644
--- a/lib/models/room.js
+++ b/lib/models/room.js
@@ -438,7 +438,7 @@ function calculateRoomName(room, userId) {
     // check for an alias, if any. for now, assume first alias is the
     // official one.
     var mRoomName = room.currentState.getStateEvents("m.room.name", "");
-    if (mRoomName) {
+    if (mRoomName && mRoomName.getContent() && mRoomName.getContent().name) {
         return mRoomName.getContent().name;
     }