diff --git a/slixmpp_omemo/__init__.py b/slixmpp_omemo/__init__.py
index 7af6e83..751a35c 100644
--- a/slixmpp_omemo/__init__.py
+++ b/slixmpp_omemo/__init__.py
@@ -595,7 +595,8 @@ class XEP_0384(BasePlugin):
                     # OMEMO lib to not encrypt to this device
                     if exn.problem == 'undecided':
                         raise UndecidedException(exn.bare_jid, exn.device, exn.ik)
-                    expect_problems.setdefault(exn.bare_jid, []).append(exn.device)
+                    distrusted_jid = JID(exn.bare_jid)
+                    expect_problems.setdefault(distrusted_jid, []).append(exn.device)
                 elif isinstance(exn, omemo.exceptions.NoEligibleDevicesException):
                     # This error is returned by the library to specify that
                     # encryption is not possible to any device of a user.