diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
index 2b1c2364e..b313c02fd 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
@@ -1076,6 +1076,8 @@ private fun NoteBody(
 fun DisplayZapSplits(noteEvent: EventInterface, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     val list = remember(noteEvent) { noteEvent.zapSplitSetup() }
 
+    if (list.isEmpty()) return
+
     Row(verticalAlignment = CenterVertically) {
         Box(
             Modifier
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt
index 9073c78ad..04231840f 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt
@@ -127,7 +127,6 @@ fun WatchAccountForVideoScreen(videoFeedView: NostrVideoFeedViewModel, accountVi
     }
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun SaveableFeedState(
     videoFeedView: NostrVideoFeedViewModel,
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/Event.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/Event.kt
index 3ed0990cc..20851034d 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/Event.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/Event.kt
@@ -96,16 +96,20 @@ open class Event(
     override fun hasZapSplitSetup() = tags.any { it.size > 1 && it[0] == "zap" }
 
     override fun zapSplitSetup(): List<ZapSplitSetup> {
-        return tags.filter { it.size > 1 && it[0] == "zap" }.map {
+        return tags.filter { it.size > 1 && it[0] == "zap" }.mapNotNull {
             val isLnAddress = it[0].contains("@") || it[0].startsWith("LNURL", true)
             val weight = if (isLnAddress) 1.0 else (it.getOrNull(3)?.toDoubleOrNull() ?: 0.0)
 
-            ZapSplitSetup(
-                it[1],
-                it.getOrNull(2),
-                weight,
-                isLnAddress
-            )
+            if (weight > 0) {
+                ZapSplitSetup(
+                    it[1],
+                    it.getOrNull(2),
+                    weight,
+                    isLnAddress
+                )
+            } else {
+                null
+            }
         }
     }