diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java
index e74ace1a5..59cc17ca1 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java
@@ -489,7 +489,8 @@ public void userCapsNodeChanged(String user, ArrayList<String> fullJids,
             if(JabberActivator.getConfigurationService()
                 .getBoolean(
                     PROP_XMPP_USE_ALL_RESOURCES_FOR_CAPABILITIES,
-                    USE_ALL_RESOURCES_FOR_CAPABILITIES_DEFAULT))
+                    USE_ALL_RESOURCES_FOR_CAPABILITIES_DEFAULT)
+                && !fullJids.isEmpty())
             {
                 String bareJid = StringUtils.parseBareAddress(user);
                 Contact contact = opsetPresence.findContactByID(bareJid);
@@ -570,7 +571,7 @@ public void fireContactCapabilitiesChanged(String user,
             .getBoolean(
                 PROP_XMPP_USE_ALL_RESOURCES_FOR_CAPABILITIES,
                 USE_ALL_RESOURCES_FOR_CAPABILITIES_DEFAULT)
-            ||fullJids.isEmpty())
+            || fullJids.isEmpty())
         {
             OperationSetPresence opsetPresence
             = parentProvider.getOperationSet(OperationSetPresence.class);