diff --git a/src/main/java/eu/siacs/conversations/entities/Presences.java b/src/main/java/eu/siacs/conversations/entities/Presences.java
index e3911c7aae4933ae88c0b0f633239ab2d1c80d8b..0d471213dbc82a54ae4d1b92980f9f697bf3e877 100644
--- a/src/main/java/eu/siacs/conversations/entities/Presences.java
+++ b/src/main/java/eu/siacs/conversations/entities/Presences.java
@@ -151,6 +151,7 @@ public class Presences {
                 jids.add(jid);
             }
         }
+        jids.add(contact.getJid().asBareJid());
         return jids;
     }
 
@@ -202,7 +203,7 @@ public class Presences {
         for (final var jid : getFullJids()) {
             final var disco = connection.getManager(DiscoManager.class).get(jid);
             if (disco != null && disco.hasFeature(namespace)) {
-                return jid.getResource();
+                return jid.getResource() == null ? "" : jid.getResource();
             }
         }
         return null;