diff --git a/client/lib/chatMessages.coffee b/client/lib/chatMessages.coffee
index 99d59037324..cbd9dbc0a98 100644
--- a/client/lib/chatMessages.coffee
+++ b/client/lib/chatMessages.coffee
@@ -61,7 +61,7 @@
 		self.typingTimeout = null
 
 	startEditingLastMessage = (rid, imput) ->
-		lastMessage = ChatMessage.findOne { rid: rid, t: {$exists: false}, uid: Meteor.userId() }, { sort: { ts: -1 } }
+		lastMessage = ChatMessage.findOne { rid: rid, t: {$exists: false}, 'u._id': Meteor.userId() }, { sort: { ts: -1 } }
 		if not lastMessage?
 			return