diff --git a/js/client-mainmenu.js b/js/client-mainmenu.js
index dbd0a69b8..ad64a2f29 100644
--- a/js/client-mainmenu.js
+++ b/js/client-mainmenu.js
@@ -75,6 +75,10 @@
 			var userid = toUserid(name);
 			if (app.ignore[userid] && name.substr(0, 1) === ' ') return;
 
+			if (app.curSideRoom && app.curSideRoom.addPM && !Tools.prefs('nolobbypm')) {
+				app.curSideRoom.addPM(parts[1], message, parts[2]);
+			}
+
 			var oName = name;
 			if (toId(name) === app.user.get('userid')) {
 				oName = target;
diff --git a/js/client.js b/js/client.js
index cb6379be6..98332e434 100644
--- a/js/client.js
+++ b/js/client.js
@@ -880,10 +880,8 @@
 
 			case 'pm':
 				var message = parts.slice(3).join('|');
+
 				this.rooms[''].addPM(parts[1], message, parts[2]);
-				if (this.rooms['lobby'] && !Tools.prefs('nolobbypm')) {
-					this.rooms['lobby'].addPM(parts[1], message, parts[2]);
-				}
 				break;
 
 			case 'roomerror':