diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt
index bfbfa71c8..0c03ebd7a 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt
@@ -111,14 +111,17 @@ class PollNoteViewModel : ViewModel() {
             }
 
             tallies.forEach {
-                it.zappedValue.value = zappedPollOptionAmount(it.option)
-                it.tally.value =
-                    if (totalZapped.compareTo(BigDecimal.ZERO) > 0) {
-                        it.zappedValue.value.divide(totalZapped, 2, RoundingMode.HALF_UP)
+                val zappedValue = zappedPollOptionAmount(it.option)
+                val tallyValue =
+                    if (totalZapped > BigDecimal.ZERO) {
+                        zappedValue.divide(totalZapped, 2, RoundingMode.HALF_UP)
                     } else {
                         BigDecimal.ZERO
                     }
-                it.consensusThreadhold.value = consensusThreshold != null && it.tally.value >= consensusThreshold!!
+
+                it.zappedValue.value = zappedValue
+                it.tally.value = tallyValue
+                it.consensusThreadhold.value = consensusThreshold != null && tallyValue >= consensusThreshold!!
                 it.zappedByLoggedIn.value = account?.userProfile()?.let { it1 -> cachedIsPollOptionZappedBy(it.option, it1) } ?: false
             }
         }