diff --git a/dist/converse.js b/dist/converse.js
index 91fb35c65..bd7c1b38d 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -69716,7 +69716,8 @@ u.matchesSelector = function (el, selector) {
    *      (DOMElement) el - The DOM element
    *      (String) selector - The selector
    */
-  return (el.matches || el.matchesSelector || el.msMatchesSelector || el.mozMatchesSelector || el.webkitMatchesSelector || el.oMatchesSelector).call(el, selector);
+  const match = el.matches || el.matchesSelector || el.msMatchesSelector || el.mozMatchesSelector || el.webkitMatchesSelector || el.oMatchesSelector;
+  return match ? match.call(el, selector) : false;
 };
 
 u.queryChildren = function (el, selector) {
diff --git a/src/headless/utils/core.js b/src/headless/utils/core.js
index bfbe89b34..062ce5054 100644
--- a/src/headless/utils/core.js
+++ b/src/headless/utils/core.js
@@ -179,14 +179,15 @@ u.matchesSelector = function (el, selector) {
      *      (DOMElement) el - The DOM element
      *      (String) selector - The selector
      */
-    return (
+    const match = (
         el.matches ||
         el.matchesSelector ||
         el.msMatchesSelector ||
         el.mozMatchesSelector ||
         el.webkitMatchesSelector ||
         el.oMatchesSelector
-    ).call(el, selector);
+    );
+    return match ? match.call(el, selector) : false;
 };
 
 u.queryChildren = function (el, selector) {