diff --git a/sleekxmpp/plugins/xep_0030/disco.py b/sleekxmpp/plugins/xep_0030/disco.py
index 67468735..a976b988 100644
--- a/sleekxmpp/plugins/xep_0030/disco.py
+++ b/sleekxmpp/plugins/xep_0030/disco.py
@@ -359,8 +359,8 @@ class xep_0030(base_plugin):
             subnode -- Optional node for the item.
             ijid   -- The JID to modify.
         """
-        if jid is None:
-            jid = ''
+        if not jid:
+            jid = self.xmpp.boundjid.full
         kwargs = {'ijid': jid,
                   'name': name,
                   'inode': subnode}