diff --git a/lib/plugins/disco.js b/lib/plugins/disco.js
index <HASH>..<HASH> 100644
--- a/lib/plugins/disco.js
+++ b/lib/plugins/disco.js
@@ -168,7 +168,7 @@ module.exports = function (client, stanzas) {
 
     client.registerFeature('caps', 100, function (features, cb) {
         this.emit('disco:caps', {
-            from: new JID(client.jid.domain),
+            from: new JID(client.jid.domain || client.config.server),
             caps: features.caps
         });
         this.features.negotiated.caps = true;
Fallback to use configured server for stream feature caps