diff --git a/js/client.js b/js/client.js
index f4f93ab91..8f8ad7b3e 100644
--- a/js/client.js
+++ b/js/client.js
@@ -233,6 +233,9 @@
 
 			this.topbar = new Topbar({el: $('#header')});
 			this.addRoom('');
+			if ($(window).width() >= 916) {
+				this.addRoom('lobby');
+			}
 
 			var self = this;
 
@@ -655,10 +658,6 @@
 					self.send('{"room":"lobby","nojoin":1,"type":"join"}', true);
 				}
 
-				if ($(window).width() >= 916) {
-					self.addRoom('lobby');
-				}
-
 				var avatar = Tools.prefs('avatar');
 				if (avatar) {
 					// This will be compatible even with servers that don't support