diff --git a/smack-core/src/main/java/org/jivesoftware/smack/Roster.java b/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
index 0e2e310d6..8d6e04ec1 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
@@ -844,10 +844,15 @@ public class Roster {
      * This is used by {@link RosterPushListener} and {@link RosterResultListener}.
      * */
     private static boolean hasValidSubscriptionType(RosterPacket.Item item) {
-        return item.getItemType().equals(RosterPacket.ItemType.none)
-                || item.getItemType().equals(RosterPacket.ItemType.from)
-                || item.getItemType().equals(RosterPacket.ItemType.to)
-                || item.getItemType().equals(RosterPacket.ItemType.both);
+        switch (item.getItemType()) {
+            case none:
+            case from:
+            case to:
+            case both:
+                return true;
+            default:
+                return false;
+        }
     }
 
     private boolean isRosterVersioningSupported() {