diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
index 7c99f04146..b73243909f 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -144,7 +144,7 @@ object LocalCache {
             e.printStackTrace()
             null
           }
-        }.filterNotNull(),
+        }.filterNotNull().toSet(),
         event.createdAt
       )
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt
index 2f23a137a0..4991326219 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt
@@ -49,7 +49,7 @@ class User(val pubkey: ByteArray) {
         return info.picture ?: "https://robohash.org/${pubkeyHex}.png"
     }
 
-    fun follow(user: User) {
+    fun follow(user: User, followedAt: Long) {
         follows.add(user)
         user.followers.add(this)
 
@@ -78,7 +78,7 @@ class User(val pubkey: ByteArray) {
         live.refresh()
     }
 
-    fun updateFollows(newFollows: List<User>, updateAt: Long) {
+    fun updateFollows(newFollows: Set<User>, updateAt: Long) {
         val toBeAdded = synchronized(follows) {
             newFollows - follows
         }
@@ -86,7 +86,7 @@ class User(val pubkey: ByteArray) {
             follows - newFollows
         }
         toBeAdded.forEach {
-            follow(it)
+            follow(it, updateAt)
         }
         toBeRemoved.forEach {
             unfollow(it)