diff --git a/src/common/config.py b/src/common/config.py
index 960b395167efaa0b54e5b6610e5ea515731af3c1..8cd7f581599666b07009aa0afdbaad8067c17ece 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -365,7 +365,7 @@ class Config:
 		'contact_disconnected': [ True, '../data/sounds/disconnected.wav' ],
 		'message_sent': [ True, '../data/sounds/sent.wav' ],
 		'muc_message_highlight': [ True, '../data/sounds/gc_message1.wav', _('Sound to play when a MUC message contains one of the words in muc_highlight_words, or when a MUC message contains your nickname.')],
-		'muc_message_received': [ True, '../data/sounds/gc_message2.wav', _('Sound to play when any MUC message arrives. (This setting is taken into account only if notify_on_all_muc_messages is True)') ],
+		'muc_message_received': [ False, '../data/sounds/gc_message2.wav', _('Sound to play when any MUC message arrives.') ],
 	}
 
 	themes_default = {
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index c4484530eacd356619a68dc92b6e06a958a6d398..09e68c10de46f6eb0100875246cbb523cab2b13b 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -599,8 +599,7 @@ class GroupchatControl(ChatControlBase):
 
 		# Do we play a sound on every muc message?
 		if gajim.config.get_per('soundevents', 'muc_message_received', 'enabled'):
-			if gajim.config.get('notify_on_all_muc_messages'):
-				sound = 'received'
+			sound = 'received'
 
 		# Are any of the defined highlighting words in the text?
 		if self.needs_visual_notification(text):