diff --git a/src/messaging/data.js b/src/messaging/data.js
index 21ea1e7d17..4043752be4 100644
--- a/src/messaging/data.js
+++ b/src/messaging/data.js
@@ -101,6 +101,8 @@ module.exports = function (Messaging) {
 				} else if (index > 0 && message.fromuid !== messages[index - 1].fromuid) {
 					// If the previous message was from the other person, this is also a new set
 					message.newSet = true;
+				} else if (index === 0) {
+					message.newSet = true;
 				}
 
 				return message;