diff --git a/app/xmpp/index.js b/app/xmpp/index.js
index <HASH>..<HASH> 100644
--- a/app/xmpp/index.js
+++ b/app/xmpp/index.js
@@ -61,11 +61,40 @@ function xmppStart(core) {
                 return processor.run();
             });
 
-            if (!handled && settings.xmpp.debug.unhandled) {
+            if (handled) {
+                return;
+            }
+
+            if (settings.xmpp.debug.unhandled) {
                 // Print unhandled request
                 console.log(' ');
                 console.log(stanza.root().toString().red);
             }
+
+            if (stanza.name !== 'iq') {
+                return;
+            }
+
+            var msg = new Stanza.Iq({
+                type: 'error',
+                id: stanza.attrs.id,
+                to: stanza.attrs.from,
+                from: stanza.attrs.to
+            });
+
+            msg.c('not-implemented', {
+                code: 501,
+                type: 'CANCEL'
+            }).c('feature-not-implemented', {
+                xmlns: 'urn:ietf:params:xml:n:xmpp-stanzas'
+            });
+
+
+            if (settings.xmpp.debug.unhandled) {
+                console.log(msg.root().toString().green);
+            }
+
+            client.send(msg);
         });
 
         // On Disconnect event. When a client disconnects
Reply to unimplemented XMPP query requests