diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java
index f8238ca5..0632c0b8 100644
--- a/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java
+++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java
@@ -50,7 +50,7 @@ public class HabboInfo implements Runnable {
     private String photoJSON;
     private int webPublishTimestamp;
     private String machineID;
-    private HashSet<NavigatorSavedSearch> savedSearches = new HashSet<>();
+    private List<NavigatorSavedSearch> savedSearches = new ArrayList<>();
 
     public HabboInfo(ResultSet set) {
         try {
@@ -125,7 +125,7 @@ public class HabboInfo implements Runnable {
     }
 
     private void loadSavedSearches() {
-        this.savedSearches = new HashSet<>();
+        this.savedSearches = new ArrayList<>();
 
         try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("SELECT * FROM users_saved_searches WHERE user_id = ?")) {
             statement.setInt(1, this.id);
@@ -470,7 +470,7 @@ public class HabboInfo implements Runnable {
         this.machineID = machineID;
     }
 
-    public HashSet<NavigatorSavedSearch> getSavedSearches() {
+    public List<NavigatorSavedSearch> getSavedSearches() {
         return this.savedSearches;
     }
 
diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java
index 5fbe97bc..93845f71 100644
--- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java
+++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java
@@ -6,11 +6,12 @@ import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
 import java.util.HashSet;
+import java.util.List;
 
 public class NewNavigatorSavedSearchesComposer extends MessageComposer {
-    private final HashSet<NavigatorSavedSearch> searches;
+    private final List<NavigatorSavedSearch> searches;
 
-    public NewNavigatorSavedSearchesComposer(HashSet<NavigatorSavedSearch> searches) {
+    public NewNavigatorSavedSearchesComposer(List<NavigatorSavedSearch> searches) {
         this.searches = searches;
     }