diff --git a/services/real-time/app/coffee/ConnectedUsersManager.coffee b/services/real-time/app/coffee/ConnectedUsersManager.coffee
index 46454471ba..831a237356 100644
--- a/services/real-time/app/coffee/ConnectedUsersManager.coffee
+++ b/services/real-time/app/coffee/ConnectedUsersManager.coffee
@@ -50,7 +50,7 @@ module.exports =
 
 	_getConnectedUser: (project_id, client_id, callback)->
 		rclient.hgetall Keys.connectedUser({project_id, client_id}), (err, result)->
-			if !result?
+			if !result? or Object.keys(result).length == 0
 				result =
 					connected : false
 					client_id:client_id
diff --git a/services/real-time/test/unit/coffee/ConnectedUsersManagerTests.coffee b/services/real-time/test/unit/coffee/ConnectedUsersManagerTests.coffee
index 9f77cb0e8b..7d83cf1a0d 100644
--- a/services/real-time/test/unit/coffee/ConnectedUsersManagerTests.coffee
+++ b/services/real-time/test/unit/coffee/ConnectedUsersManagerTests.coffee
@@ -122,7 +122,7 @@ describe "ConnectedUsersManager", ->
 
 	describe "_getConnectedUser", ->
 
-		it "should get the user returning connected if there is a value", (done)->
+		it "should return a connected user if there is a user object", (done)->
 			cursorData = JSON.stringify(cursorData:{row:1})
 			@rClient.hgetall.callsArgWith(1, null, {connected_at:new Date(), cursorData})
 			@ConnectedUsersManager._getConnectedUser @project_id, @client_id, (err, result)=>
@@ -130,8 +130,15 @@ describe "ConnectedUsersManager", ->
 				result.client_id.should.equal @client_id
 				done()
 
-		it "should get the user returning connected if there is a value", (done)->
-			@rClient.hgetall.callsArgWith(1)
+		it "should return a not connected user if there is no object", (done)->
+			@rClient.hgetall.callsArgWith(1, null, null)
+			@ConnectedUsersManager._getConnectedUser @project_id, @client_id, (err, result)=>
+				result.connected.should.equal false
+				result.client_id.should.equal @client_id
+				done()
+
+		it "should return a not connected user if there is an empty object", (done)->
+			@rClient.hgetall.callsArgWith(1, null, {})
 			@ConnectedUsersManager._getConnectedUser @project_id, @client_id, (err, result)=>
 				result.connected.should.equal false
 				result.client_id.should.equal @client_id