diff --git a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
index b327e415..8b941bbb 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
@@ -118,7 +118,7 @@ class ChatViewModel(
         
         // Load other data
         dataManager.loadFavorites()
-        state.setFavoritePeers(dataManager.favoritePeers)
+        state.setFavoritePeers(dataManager.favoritePeers.toSet())
         dataManager.loadBlockedUsers()
         
         // Log all favorites at startup