diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js
index b749c2e068..a983519183 100644
--- a/public/src/modules/notifications.js
+++ b/public/src/modules/notifications.js
@@ -90,6 +90,9 @@ define('notifications', [
 		if (ajaxify.currentPage === 'notifications') {
 			ajaxify.refresh();
 		}
+		if (ajaxify.data.template.chats && parseInt(ajaxify.data.roomId, 10) === parseInt(notifData.roomId, 10)) {
+			return;
+		}
 
 		socket.emit('notifications.getCount', function (err, count) {
 			if (err) {
diff --git a/src/api/chats.js b/src/api/chats.js
index cf7bc6c7ee..3b40f92eba 100644
--- a/src/api/chats.js
+++ b/src/api/chats.js
@@ -6,6 +6,7 @@ const db = require('../database');
 const user = require('../user');
 const meta = require('../meta');
 const messaging = require('../messaging');
+const notifications = require('../notifications');
 const plugins = require('../plugins');
 const privileges = require('../privileges');
 
@@ -156,6 +157,9 @@ chatsAPI.mark = async (caller, data) => {
 	} else {
 		await messaging.markRead(caller.uid, roomId);
 		socketHelpers.emitToUids('event:chats.markedAsRead', { roomId: roomId }, [caller.uid]);
+		const nids = await user.notifications.getUnreadByField(caller.uid, 'roomId', [roomId]);
+		await notifications.markReadMultiple(nids, caller.uid);
+		user.notifications.pushCount(caller.uid);
 	}
 
 	socketHelpers.emitToUids('event:chats.mark', { roomId, state }, [caller.uid]);
diff --git a/src/messaging/notifications.js b/src/messaging/notifications.js
index b790649416..ff1f98697f 100644
--- a/src/messaging/notifications.js
+++ b/src/messaging/notifications.js
@@ -128,6 +128,7 @@ module.exports = function (Messaging) {
 				bodyLong: messageObj.content,
 				nid: `chat_${roomId}_${fromUid}`,
 				from: fromUid,
+				roomId: roomId,
 				path: `/chats/${messageObj.roomId}`,
 			};
 			if (roomData.public) {