diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java
index 83cbe09f6..698e89df2 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java
@@ -242,6 +242,7 @@ public final class OmemoManager extends Manager {
             }
 
             getOmemoService().init(new LoggedInOmemoManager(this));
+            ServiceDiscoveryManager.getInstanceFor(connection()).addFeature(PEP_NODE_DEVICE_LIST_NOTIFY);
         }
     }
 
@@ -935,7 +936,7 @@ public final class OmemoManager extends Manager {
                     OmemoCachedDeviceList deviceList = getOmemoService().cleanUpDeviceList(getOwnDevice());
                     final OmemoDeviceListElement_VAxolotl newDeviceList = new OmemoDeviceListElement_VAxolotl(deviceList);
 
-                    if (!newDeviceList.equals(receivedDeviceList)) {
+                    if (!newDeviceList.copyDeviceIds().equals(receivedDeviceList.copyDeviceIds())) {
                         Async.go(new Runnable() {
                             @Override
                             public void run() {
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
index 780a2e252..2b61bde65 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
@@ -706,6 +706,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
         try {
             publishedList = fetchDeviceList(connection, userDevice.getJid());
         } catch (PubSubException.NotAPubSubNodeException e) {
+            LOGGER.log(Level.WARNING, "Error refreshing deviceList: ", e);
             publishedList = null;
         }
         if (publishedList == null) {