diff --git a/src/headless/converse-muc.js b/src/headless/converse-muc.js
index e95c1a12c..f021dce95 100644
--- a/src/headless/converse-muc.js
+++ b/src/headless/converse-muc.js
@@ -1811,9 +1811,9 @@ converse.plugins.add('converse-muc', {
                  */
                 const jid = Strophe.getBareJidFromJid(data.jid);
                 if (jid !== null) {
-                    return this.where({'jid': jid}).pop();
+                    return this.findWhere({'jid': jid});
                 } else {
-                    return this.where({'nick': data.nick}).pop();
+                    return this.findWhere({'nick': data.nick});
                 }
             }
         });