diff --git a/src/converse-api.js b/src/converse-api.js
index 8166acf40..3cbd47d47 100644
--- a/src/converse-api.js
+++ b/src/converse-api.js
@@ -145,7 +145,12 @@
                 converse.off(evt, handler);
             },
             'stanza': function (name, options, handler) {
-                options = options || {};
+                if (typeof options === 'function') {
+                    handler = options;
+                    options = {};
+                } else {
+                    options = options || {};
+                }
                 converse.connection.addHandler(
                     handler,
                     options.ns,