diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 5f67e78810..0fdee234f4 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -188,7 +188,9 @@ Sockets.init = function(server) {
 			emitOnlineUserCount();
 
 			for(var roomName in io.sockets.manager.roomClients[socket.id]) {
-				updateRoomBrowsingText(roomName.slice(1));
+				if (roomName.indexOf('topic') !== -1) {
+					updateRoomBrowsingText(roomName.slice(1));
+				}
 			}
 		});
 
diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js
index 42814005ab..f4761ccfb0 100644
--- a/src/socket.io/meta.js
+++ b/src/socket.io/meta.js
@@ -72,15 +72,13 @@ SocketMeta.rooms.enter = function(socket, data, callback) {
 
 	socket.join(data.enter);
 
-	if (data.leave && data.leave !== data.enter) {
+	if (data.leave && data.leave !== data.enter && data.leave.indexOf('topic') !== -1) {
 		module.parent.exports.updateRoomBrowsingText(data.leave);
 	}
 
-	module.parent.exports.updateRoomBrowsingText(data.enter);
-
-	//if (data.enter !== 'admin') {
-	//	websockets.in('admin').emit('event:meta.rooms.update', null, websockets.server.sockets.manager.rooms);
-	//}
+	if (data.enter.indexOf('topic') !== -1) {
+		module.parent.exports.updateRoomBrowsingText(data.enter);
+	}
 };
 
 SocketMeta.rooms.getAll = function(socket, data, callback) {
@@ -88,7 +86,7 @@ SocketMeta.rooms.getAll = function(socket, data, callback) {
 		onlineGuestCount: websockets.getOnlineAnonCount(),
 		onlineRegisteredCount: websockets.getConnectedClients().length,
 		rooms: websockets.server.sockets.manager.rooms
-	}
+	};
 
 	callback(null, userData);
 };