diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/ClawViewModel.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/ClawViewModel.kt
index c6c884c1..30058da1 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/ClawViewModel.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/ClawViewModel.kt
@@ -36,7 +36,12 @@ constructor(
   val savedPosts
     get() = repository.savedPosts
 
-  suspend fun isPostSaved(post: SavedPost) = savedPosts.mapLatest { posts -> post in posts }.first()
+  suspend fun isPostSaved(post: SavedPost): Boolean {
+    return savedPosts
+      .mapLatest { posts -> posts.map { it.shortId } }
+      .mapLatest { shortIds -> post.shortId in shortIds }
+      .first()
+  }
 
   fun toggleSave(post: SavedPost) {
     viewModelScope.launch {