diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
index 628485cb4..8aa87ba15 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
@@ -413,9 +413,20 @@ fun ZapVote(
         }
 
         if (wantsToPay.isNotEmpty()) {
-            PayViaIntentDialog(payingInvoices = wantsToPay, accountViewModel = accountViewModel) {
-                wantsToPay = persistentListOf()
-            }
+            PayViaIntentDialog(
+                payingInvoices = wantsToPay,
+                accountViewModel = accountViewModel,
+                onClose = {
+                    wantsToPay = persistentListOf()
+                },
+                onError = {
+                    wantsToPay = persistentListOf()
+                    scope.launch {
+                        zappingProgress = 0f
+                        showErrorMessageDialog = it
+                    }
+                }
+            )
         }
 
         if (showErrorMessageDialog != null) {
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 7f9a63a57..1384d13a5 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
@@ -1056,9 +1056,20 @@ fun ZapReaction(
         }
 
         if (wantsToPay.isNotEmpty()) {
-            PayViaIntentDialog(payingInvoices = wantsToPay, accountViewModel = accountViewModel) {
-                wantsToPay = persistentListOf()
-            }
+            PayViaIntentDialog(
+                payingInvoices = wantsToPay,
+                accountViewModel = accountViewModel,
+                onClose = {
+                    wantsToPay = persistentListOf()
+                },
+                onError = {
+                    wantsToPay = persistentListOf()
+                    scope.launch {
+                        zappingProgress = 0f
+                        showErrorMessageDialog = it
+                    }
+                }
+            )
         }
 
         if (wantsToSetCustomZap) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapCustomDialog.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapCustomDialog.kt
index 55cd5b569..5acecbbf0 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapCustomDialog.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapCustomDialog.kt
@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import androidx.compose.foundation.layout.*
@@ -144,6 +145,7 @@ fun ZapCustomDialog(
                             onPayViaIntent = onPayViaIntent,
                             zapType = selectedZapType
                         )
+                        onClose()
                     }
                 }
 
@@ -298,84 +300,84 @@ fun ErrorMessageDialog(
 fun PayViaIntentDialog(
     payingInvoices: ImmutableList<ZapPaymentHandler.Payable>,
     accountViewModel: AccountViewModel,
-    onClose: () -> Unit
+    onClose: () -> Unit,
+    onError: (String) -> Unit
 ) {
     val context = LocalContext.current
 
-    Dialog(
-        onDismissRequest = onClose,
-        properties = DialogProperties(
-            dismissOnClickOutside = false,
-            usePlatformDefaultWidth = false
-        )
-    ) {
-        Surface() {
-            Column(modifier = Modifier.padding(10.dp)) {
-                Row(
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    CloseButton(onPress = onClose)
-                }
-
-                Spacer(modifier = DoubleVertSpacer)
-
-                payingInvoices.forEachIndexed { index, it ->
-                    val paid = remember {
-                        mutableStateOf(false)
+    if (payingInvoices.size == 1) {
+        payViaIntent(payingInvoices.first().invoice, context, onError)
+    } else {
+        Dialog(
+            onDismissRequest = onClose,
+            properties = DialogProperties(
+                dismissOnClickOutside = false,
+                usePlatformDefaultWidth = false
+            )
+        ) {
+            Surface() {
+                Column(modifier = Modifier.padding(10.dp)) {
+                    Row(
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        CloseButton(onPress = onClose)
                     }
 
-                    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size10dp)) {
-                        if (it.user != null) {
-                            BaseUserPicture(it.user, Size55dp, accountViewModel = accountViewModel)
-                        } else {
-                            DisplayBlankAuthor(size = Size55dp)
+                    Spacer(modifier = DoubleVertSpacer)
+
+                    payingInvoices.forEachIndexed { index, it ->
+                        val paid = remember {
+                            mutableStateOf(false)
                         }
 
-                        Spacer(modifier = DoubleHorzSpacer)
-
-                        Column(modifier = Modifier.weight(1f)) {
+                        Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size10dp)) {
                             if (it.user != null) {
-                                UsernameDisplay(it.user, showPlayButton = false)
+                                BaseUserPicture(it.user, Size55dp, accountViewModel = accountViewModel)
                             } else {
-                                Text(
-                                    text = stringResource(id = R.string.wallet_number, index + 1),
-                                    maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis,
-                                    fontWeight = FontWeight.Bold,
-                                    fontSize = 18.sp
-                                )
+                                DisplayBlankAuthor(size = Size55dp)
                             }
-                            Row() {
-                                Text(
-                                    text = showAmount((it.amountMilliSats / 1000.0f).toBigDecimal()),
-                                    maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis,
-                                    fontWeight = FontWeight.Bold,
-                                    fontSize = 18.sp
-                                )
-                                Spacer(modifier = StdHorzSpacer)
-                                Text(
-                                    text = stringResource(id = R.string.sats),
-                                    maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis,
-                                    fontWeight = FontWeight.Bold,
-                                    fontSize = 18.sp
-                                )
+
+                            Spacer(modifier = DoubleHorzSpacer)
+
+                            Column(modifier = Modifier.weight(1f)) {
+                                if (it.user != null) {
+                                    UsernameDisplay(it.user, showPlayButton = false)
+                                } else {
+                                    Text(
+                                        text = stringResource(id = R.string.wallet_number, index + 1),
+                                        maxLines = 1,
+                                        overflow = TextOverflow.Ellipsis,
+                                        fontWeight = FontWeight.Bold,
+                                        fontSize = 18.sp
+                                    )
+                                }
+                                Row() {
+                                    Text(
+                                        text = showAmount((it.amountMilliSats / 1000.0f).toBigDecimal()),
+                                        maxLines = 1,
+                                        overflow = TextOverflow.Ellipsis,
+                                        fontWeight = FontWeight.Bold,
+                                        fontSize = 18.sp
+                                    )
+                                    Spacer(modifier = StdHorzSpacer)
+                                    Text(
+                                        text = stringResource(id = R.string.sats),
+                                        maxLines = 1,
+                                        overflow = TextOverflow.Ellipsis,
+                                        fontWeight = FontWeight.Bold,
+                                        fontSize = 18.sp
+                                    )
+                                }
                             }
-                        }
 
-                        Spacer(modifier = DoubleHorzSpacer)
+                            Spacer(modifier = DoubleHorzSpacer)
 
-                        PayButton(isActive = !paid.value) {
-                            paid.value = true
+                            PayButton(isActive = !paid.value) {
+                                paid.value = true
 
-                            val uri = "lightning:" + it.invoice
-
-                            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(uri))
-                            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-
-                            ContextCompat.startActivity(context, intent, null)
+                                payViaIntent(it.invoice, context, onError)
+                            }
                         }
                     }
                 }
@@ -384,6 +386,21 @@ fun PayViaIntentDialog(
     }
 }
 
+fun payViaIntent(invoice: String, context: Context, onError: (String) -> Unit) {
+    try {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$invoice"))
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+
+        ContextCompat.startActivity(context, intent, null)
+    } catch (e: Exception) {
+        if (e.message != null) {
+            onError(context.getString(R.string.no_wallet_found_with_error, e.message!!))
+        } else {
+            onError(context.getString(R.string.no_wallet_found))
+        }
+    }
+}
+
 @Composable
 fun PayButton(isActive: Boolean, modifier: Modifier = Modifier, onPost: () -> Unit = {}) {
     Button(
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 08d57e198..a3772e1a4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -590,4 +590,7 @@
     <string name="wallet_number">Wallet %1$s</string>
     <string name="error_opening_external_signer">Error opening signer app</string>
     <string name="sign_request_rejected">Sign request rejected</string>
+
+    <string name="no_wallet_found_with_error">No Wallets found to pay a lightning invoice (Error: %1$s). Please install a Lightning wallet to use zaps</string>
+    <string name="no_wallet_found">No Wallets found to pay a lightning invoice. Please install a Lightning wallet to use zaps</string>
 </resources>