diff --git a/src/plugins/plugin_xep_0033.py b/src/plugins/plugin_xep_0033.py
index 9d753a2e..81cb061f 100644
--- a/src/plugins/plugin_xep_0033.py
+++ b/src/plugins/plugin_xep_0033.py
@@ -86,9 +86,8 @@ class XEP_0033(object):
             def discoCallback(entity):
                 if entity is None:
                     return Failure(AbortSendMessage(_("XEP-0033 is being used but the server doesn't support it!")))
-                to = JID(mess_data["to"].host)
-                if to != entity:
-                    logging.warning(_("Stanzas using XEP-0033 should be addressed to %s, not %s!") % (entity, to))
+                if mess_data["to"] != entity:
+                    logging.warning(_("Stanzas using XEP-0033 should be addressed to %s, not %s!") % (entity, mess_data["to"]))
                     logging.warning(_("TODO: addressing has be fixed by the backend... fix it in the frontend!"))
                     mess_data["to"] = entity
                 element = mess_data['xml'].addElement('addresses', NS_ADDRESS)