diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
index 8fde12944..41b05af49 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
@@ -1142,10 +1142,12 @@ fun ObserveZapAmountText(
 
     if (zapsState?.note?.zapPayments?.isNotEmpty() == true) {
         val zapAmountTxt by
-            produceState(initialValue = showAmount(baseNote.zapsAmount), key1 = baseNote) {
-                accountViewModel.calculateZapAmount(baseNote) { newZapAmount ->
-                    if (value != newZapAmount) {
-                        value = newZapAmount
+            produceState(initialValue = showAmount(baseNote.zapsAmount), key1 = zapsState) {
+                zapsState?.note?.let {
+                    accountViewModel.calculateZapAmount(it) { newZapAmount ->
+                        if (value != newZapAmount) {
+                            value = newZapAmount
+                        }
                     }
                 }
             }