diff --git a/client/notifications/notification.js b/client/notifications/notification.js
index 3af30bf0e6f..a43e78b7cc1 100644
--- a/client/notifications/notification.js
+++ b/client/notifications/notification.js
@@ -44,6 +44,7 @@ Meteor.startup(function() {
 						KonchatNotification.showDesktop(notification);
 					}
 				} else {
+					if (!hasFocus || !messageIsInOpenedRoom) {
 						// Play a sound and show a notification.
 						KonchatNotification.newMessage(notification.payload.rid);
 						KonchatNotification.showDesktop(notification);
@@ -67,6 +68,7 @@ Meteor.startup(function() {
 						// Play a notification sound
 						KonchatNotification.newMessage(notification.payload.rid);
 					}
+				} else if (!hasFocus || !messageIsInOpenedRoom || !muteFocusedConversations) {
 					// Play a notification sound
 					KonchatNotification.newMessage(notification.payload.rid);
 				}