diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py
index 4407f4ed4..722e7e01e 100644
--- a/src/common/stanza_session.py
+++ b/src/common/stanza_session.py
@@ -83,9 +83,7 @@ class StanzaSession(object):
 
     def get_to(self):
         to = str(self.jid)
-        if self.resource and not to.endswith(self.resource):
-            to += '/' + self.resource
-        return to
+        return gajim.get_jid_without_resource(to) + self.resource
 
     def remove_events(self, types):
         """