diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt
index d4adb8d78..f93c675b8 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt
@@ -158,7 +158,11 @@ private fun FeedLoaded(
             ShowDonationCard(accountViewModel, nav)
         }
 
-        itemsIndexed(state.feed.value, key = { _, item -> item.id() }) { _, item ->
+        itemsIndexed(
+            items = state.feed.value,
+            key = { _, item -> item.id() },
+            contentType = { _, item -> item.javaClass.simpleName },
+        ) { _, item ->
             val defaultModifier = remember { Modifier.fillMaxWidth().animateItemPlacement() }
 
             Row(defaultModifier) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt
index ab8054ce9..26134adc5 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt
@@ -301,7 +301,9 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel(), I
             if (notes.isEmpty()) {
                 _feedContent.update { CardFeedState.Empty }
             } else if (currentState is CardFeedState.Loaded) {
-                currentState.showHidden.value = localFilter.showHiddenKey()
+                if (currentState.showHidden.value != localFilter.showHiddenKey()) {
+                    currentState.showHidden.value = localFilter.showHiddenKey()
+                }
                 currentState.feed.value = notes
             } else {
                 _feedContent.update {