diff --git a/services/web/app/coffee/Features/Chat/ChatController.coffee b/services/web/app/coffee/Features/Chat/ChatController.coffee
index 7e4e190290..3090f4f108 100644
--- a/services/web/app/coffee/Features/Chat/ChatController.coffee
+++ b/services/web/app/coffee/Features/Chat/ChatController.coffee
@@ -28,7 +28,7 @@ module.exports =
 		logger.log project_id:project_id, query:query, "getting messages"
 		ChatApiHandler.getGlobalMessages project_id, query.limit, query.before, (err, messages) ->
 			return next(err) if err?
-			CommentsController._injectUserInfoIntoThreads [{ messages: messages }], (err) ->
+			CommentsController._injectUserInfoIntoThreads {global: { messages: messages }}, (err) ->
 				return next(err) if err?
 				logger.log length: messages?.length, "sending messages to client"
 				res.json messages
diff --git a/services/web/app/coffee/Features/Comments/CommentsController.coffee b/services/web/app/coffee/Features/Comments/CommentsController.coffee
index 20346dccbb..ee9b8b9f84 100644
--- a/services/web/app/coffee/Features/Comments/CommentsController.coffee
+++ b/services/web/app/coffee/Features/Comments/CommentsController.coffee
@@ -62,7 +62,7 @@ module.exports = CommentsController =
 				callback null, user
 		
 		jobs = []
-		for thread in threads
+		for thread_id, thread of threads
 			do (thread) ->
 				if thread.resolved
 					jobs.push (cb) ->
diff --git a/services/web/test/UnitTests/coffee/Comments/CommentsControllerTests.coffee b/services/web/test/UnitTests/coffee/Comments/CommentsControllerTests.coffee
index ecf57abd2e..cbc24bca1f 100644
--- a/services/web/test/UnitTests/coffee/Comments/CommentsControllerTests.coffee
+++ b/services/web/test/UnitTests/coffee/Comments/CommentsControllerTests.coffee
@@ -151,8 +151,8 @@ describe "CommentsController", ->
 				return { "formatted": user["mock"] }
 			
 		it "should inject a user object into messaged and resolved data", (done) ->
-			@CommentsController._injectUserInfoIntoThreads [
-				{
+			@CommentsController._injectUserInfoIntoThreads {
+				thread1: {
 					resolved: true
 					resolved_by_user_id: "user_id_1"
 					messages: [{
@@ -163,15 +163,15 @@ describe "CommentsController", ->
 						content: "bar"
 					}]
 				},
-				{
+				thread2: {
 					messages: [{
 						user_id: "user_id_1"
 						content: "baz"
 					}]
 				}
-			], (error, threads) ->
-				expect(threads).to.deep.equal [
-					{
+			}, (error, threads) ->
+				expect(threads).to.deep.equal {
+					thread1: {
 						resolved: true
 						resolved_by_user_id: "user_id_1"
 						resolved_by_user: { "formatted": "user_1" }
@@ -185,14 +185,14 @@ describe "CommentsController", ->
 							content: "bar"
 						}]
 					},
-					{
+					thread2: {
 						messages: [{
 							user_id: "user_id_1"
 							user: { "formatted": "user_1" }
 							content: "baz"
 						}]
 					}
-				]
+				}
 				done()
 
 		it "should only need to look up each user once", (done) ->