diff --git a/src/models/room-state.js b/src/models/room-state.js
index 4cf1f25d2..e6ef57577 100644
--- a/src/models/room-state.js
+++ b/src/models/room-state.js
@@ -80,6 +80,7 @@ RoomState.prototype.getMember = function(userId) {
  * @return {RoomMember} The member or null if they do not exist.
  */
 RoomState.prototype.getSentinelMember = function(userId) {
+    if (!userId) return null;
     let sentinel = this._sentinels[userId];
 
     if (sentinel === undefined) {