diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cc3e7f6f8..d73605ea77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+#### v3.1.6 (2023-06-15)
+
+##### Chores
+
+*  incrementing version number - v3.1.5 (ec19343a)
+*  update changelog for v3.1.5 (b0d16861)
+*  incrementing version number - v3.1.4 (2452783c)
+*  incrementing version number - v3.1.3 (3b4e9d3f)
+*  incrementing version number - v3.1.2 (40fa3489)
+*  incrementing version number - v3.1.1 (40250733)
+*  incrementing version number - v3.1.0 (0cb386bd)
+*  incrementing version number - v3.0.1 (26f6ea49)
+*  incrementing version number - v3.0.0 (224e08cd)
+
+##### Bug Fixes
+
+*  #11717 prevent crash in messaging (8620a2cd)
+*  closes #11708, fix quick reply check (a757716d)
+
 #### v3.1.5 (2023-06-13)
 
 ##### Chores
diff --git a/install/package.json b/install/package.json
index 5f1f84373e..b0e3ea93b8 100644
--- a/install/package.json
+++ b/install/package.json
@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "3.1.5",
+    "version": "3.1.6",
     "homepage": "https://www.nodebb.org",
     "repository": {
         "type": "git",
diff --git a/src/messaging/index.js b/src/messaging/index.js
index ddb6eb6fbe..729ec8fedf 100644
--- a/src/messaging/index.js
+++ b/src/messaging/index.js
@@ -111,7 +111,7 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => {
 		teasers: Promise.all(roomIds.map(async roomId => Messaging.getTeaser(uid, roomId))),
 	});
 
-	results.roomData.forEach((room, index) => {
+	await Promise.all(results.roomData.map(async (room, index) => {
 		if (room) {
 			room.users = results.users[index];
 			room.groupChat = room.hasOwnProperty('groupChat') ? room.groupChat : room.users.length > 2;
@@ -125,12 +125,9 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => {
 			});
 			room.users = room.users.filter(user => user && parseInt(user.uid, 10));
 			room.lastUser = room.users[0];
-
 			room.usernames = Messaging.generateUsernames(room.users, uid);
+			room.chatWithMessage = await Messaging.generateChatWithMessage(room.users, uid);
 		}
-	});
-	await Promise.all(results.roomData.map(async (room) => {
-		room.chatWithMessage = await Messaging.generateChatWithMessage(room.users, uid);
 	}));
 
 	results.roomData = results.roomData.filter(Boolean);