diff --git a/src/chat.py b/src/chat.py
index ccd5ba7ea..6ab23a535 100644
--- a/src/chat.py
+++ b/src/chat.py
@@ -1137,7 +1137,8 @@ class Chat:
 		if (jid != self.get_active_jid() or \
 		   not self.window.is_active() or \
 		   not end) and kind == 'incoming':
-			if self.widget_name == 'groupchat_window':
+			if self.widget_name == 'groupchat_window' and\
+			not gajim.config.get('notify_on_all_muc_messages'):
 				# Do not notify us for gc messages that are not for us
 				if text.find(self.nicks[jid]) == -1:
 					return
diff --git a/src/common/config.py b/src/common/config.py
index 2df2199f0..427bd1744 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -131,6 +131,7 @@ class Config:
 		'conversation_font': [opt_str, 'Sans 10'],
 		# IEC standard says KiB = 1024 bytes KB = 1000 bytes
 		'use_kib_mib': [opt_bool, False],
+		'notify_on_all_muc_messages': [opt_bool, False],
 	}
 
 	__options_per_key = {