diff --git a/services/chat/app/coffee/Features/Messages/MessageManager.coffee b/services/chat/app/coffee/Features/Messages/MessageManager.coffee
index affc699692..a66f465163 100644
--- a/services/chat/app/coffee/Features/Messages/MessageManager.coffee
+++ b/services/chat/app/coffee/Features/Messages/MessageManager.coffee
@@ -34,6 +34,8 @@ module.exports = MessageManager =
 
 		for message in messages
 			do (message) ->
+				if !message?
+					return
 				jobs.push (callback) ->
 					getUserDetails message.user_id.toString(), (error, user) ->
 						return callback(error) if error?