diff --git a/src/converse-mam.js b/src/converse-mam.js
index 1edeb2eae..40df3367f 100644
--- a/src/converse-mam.js
+++ b/src/converse-mam.js
@@ -84,7 +84,7 @@
 
         const messages = [];
         const message_handler = _converse.connection.addHandler(function (message) {
-            if (options.groupchat || message.getAttribute('from') !== options['with']) { // eslint-disable-line dot-notation
+            if (options.groupchat && message.getAttribute('from') !== options['with']) { // eslint-disable-line dot-notation
                 return true;
             }
             const result = message.querySelector('result');