diff --git a/CHANGES.md b/CHANGES.md
index 12a29004d..d0f2198fa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@
 - #1422 Resurrect the `muc_show_join_leave` option
 - #1412 muc moderator commands can be disabled selectively by config
 - #1413 fix moderator commands that change affiliation
+- #1414 Prevent duplicate messages on MUC join
 
 ## 4.1.0 (2019-01-11)
 
diff --git a/dist/converse.js b/dist/converse.js
index 92cadedc2..507dfd360 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -66163,7 +66163,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_6__["default"].plugins.add('converse-muc
         }).c("x", {
           'xmlns': Strophe.NS.MUC
         }).c("history", {
-          'maxstanzas': this.get('mam_enabled') ? 0 : _converse.muc_history_max_stanzas
+          'maxstanzas': this.features.get('mam_enabled') ? 0 : _converse.muc_history_max_stanzas
         }).up();
 
         if (password) {
diff --git a/src/headless/converse-muc.js b/src/headless/converse-muc.js
index b6836aa4d..d3c397d65 100644
--- a/src/headless/converse-muc.js
+++ b/src/headless/converse-muc.js
@@ -293,7 +293,7 @@ converse.plugins.add('converse-muc', {
                     'from': _converse.connection.jid,
                     'to': this.getRoomJIDAndNick(nick)
                 }).c("x", {'xmlns': Strophe.NS.MUC})
-                  .c("history", {'maxstanzas': this.get('mam_enabled') ? 0 : _converse.muc_history_max_stanzas}).up();
+                  .c("history", {'maxstanzas': this.features.get('mam_enabled') ? 0 : _converse.muc_history_max_stanzas}).up();
                 if (password) {
                     stanza.cnode(Strophe.xmlElement("password", [], password));
                 }