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 811af170d..598f99f9c 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/Roster.java
@@ -702,9 +702,8 @@ public class Roster {
 
         // Mark the entry as unfiled if it does not belong to any groups.
         if (item.getGroupNames().isEmpty()) {
-            if (!unfiledEntries.contains(entry)) {
-                unfiledEntries.add(entry);
-            }
+            unfiledEntries.remove(entry);
+            unfiledEntries.add(entry);
         }
         else {
             unfiledEntries.remove(entry);