diff --git a/services/web/public/coffee/app/ide/chat/controllers/ChatController.coffee b/services/web/public/coffee/app/ide/chat/controllers/ChatController.coffee
index 5d22780419..a5c42dc435 100644
--- a/services/web/public/coffee/app/ide/chat/controllers/ChatController.coffee
+++ b/services/web/public/coffee/app/ide/chat/controllers/ChatController.coffee
@@ -49,7 +49,8 @@ define [
 			groupedMessages = []
 			for message in messages
 				shouldGroup = previousMessage? and
-					previousMessage.user == message.user
+					previousMessage.user == message.user and
+					message.timestamp - previousMessage.timestamp < TIMESTAMP_GROUP_SIZE
 				if shouldGroup
 					previousMessage.timestamp = message.timestamp
 					previousMessage.contents.push message.content