diff --git a/lib/models/room.js b/lib/models/room.js
index 851e9e30e..b685d969c 100644
--- a/lib/models/room.js
+++ b/lib/models/room.js
@@ -129,7 +129,7 @@ Room.prototype = {
                 }
                 else {
                     // there really isn't anyone in this room...
-                    return "Unknown";
+                    return "?";
                 }
             }
             else if (members.length === 1) {
diff --git a/spec/unit/room.spec.js b/spec/unit/room.spec.js
index 0d27d5860..506e3c0f1 100644
--- a/spec/unit/room.spec.js
+++ b/spec/unit/room.spec.js
@@ -253,5 +253,11 @@ describe("Room", function() {
             var name = room.calculateRoomName(userA);
             expect(name).toEqual(userA);
         });
+
+        it("should return '?' if there is no name, alias or members in the room.",
+        function() {
+            var name = room.calculateRoomName(userA);
+            expect(name).toEqual("?");
+        });
     });
 });