diff --git a/public/src/sockets.js b/public/src/sockets.js
index 7d7fca3d9f..6b11f49e4f 100644
--- a/public/src/sockets.js
+++ b/public/src/sockets.js
@@ -28,11 +28,9 @@ app.isConnected = false;
 		setTimeout(socket.connect.bind(socket), parseInt(config.reconnectionDelay, 10) * 10);
 	});
 
-	socket.on('checkSession', function (uid, remoteExist) {
-		if (parseInt(uid, 10) !== parseInt(app.user.uid, 10) && remoteExist) {
+	socket.on('checkSession', function (uid) {
+		if (parseInt(uid, 10) !== parseInt(app.user.uid, 10)) {
 			app.handleInvalidSession();
-		} else {
-			app.logout();
 		}
 	});
 
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 19a8b51f26..2e897d0c4c 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -75,20 +75,15 @@ function onConnection(socket) {
 }
 
 function onConnect(socket) {
-	user.exists(socket.uid, function (err, exists) {
-		if (err) {
-			return winston.error(err);
-		}
-		if (socket.uid && exists) {
-			socket.join('uid_' + socket.uid);
-			socket.join('online_users');
-		} else {
-			socket.join('online_guests');
-		}
+	if (socket.uid) {
+		socket.join('uid_' + socket.uid);
+		socket.join('online_users');
+	} else {
+		socket.join('online_guests');
+	}
 
-		socket.join('sess_' + socket.request.signedCookies[nconf.get('sessionKey')]);
-		io.sockets.sockets[socket.id].emit('checkSession', socket.uid, exists);
-	});
+	socket.join('sess_' + socket.request.signedCookies[nconf.get('sessionKey')]);
+	io.sockets.sockets[socket.id].emit('checkSession', socket.uid);
 }
 
 function onMessage(socket, payload) {