diff --git a/src/app/components/ReactionSummary.svelte b/src/app/components/ReactionSummary.svelte
index e6310ad2..2cbbfd18 100644
--- a/src/app/components/ReactionSummary.svelte
+++ b/src/app/components/ReactionSummary.svelte
@@ -119,7 +119,7 @@
     if (isMobile) {
       showReactors(pubkeys, info.replace(" zapped", ""), "Zapped this message")
     } else {
-      pushModal(ZapModal, {url, pubkey: event.pubkey, eventId: event.id})
+      pushModal(ZapModal, {url, pubkey: event.pubkey, event})
     }
   }
 
diff --git a/src/app/components/Zap.svelte b/src/app/components/Zap.svelte
index 4c960f44..0b51d4d5 100644
--- a/src/app/components/Zap.svelte
+++ b/src/app/components/Zap.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import {onDestroy} from "svelte"
-  import {first, removeUndefined, uniq} from "@welshman/lib"
-  import {inbox} from "@welshman/util"
+  import {first, removeUndefined} from "@welshman/lib"
+  import {relay} from "@welshman/util"
+  import type {TrustedEvent} from "@welshman/util"
   import {ZapRequest} from "@welshman/domain"
   import {Zappers} from "@welshman/app"
   import Bolt from "@assets/icons/bolt.svg?dataurl"
@@ -21,7 +22,7 @@
   import QRCode from "@app/components/QRCode.svelte"
   import WalletConnect from "@app/components/WalletConnect.svelte"
   import ZapForm from "@app/components/ZapForm.svelte"
-  import {app, domain, network, router} from "@app/core"
+  import {app, domain, network} from "@app/core"
   import {payInvoice, wallet} from "@app/lightning"
   import {pushModal} from "@app/modal"
   import {zapAmounts} from "@app/settings"
@@ -30,12 +31,10 @@
   type Props = {
     url?: string
     pubkey: string
-    eventId?: string
-    // NIP-75 requires a zap to a goal to request its receipt on the goal's own relays.
-    goalRelays?: string[]
+    event?: TrustedEvent
   }
 
-  const {url, pubkey, eventId, goalRelays = []}: Props = $props()
+  const {url, pubkey, event}: Props = $props()
 
   const zapper = $app.use(Zappers).forPubkey(pubkey, removeUndefined([url]))
 
@@ -43,20 +42,19 @@
 
   const requestInvoice = async () => {
     const currentZapper = zapper.get()!
-    const relays = uniq([
-      ...(url ? [url] : await $router.resolver.relays([inbox(pubkey)])),
-      ...goalRelays,
-    ])
     const writer = $domain
       .writer(ZapRequest)
       .setContent(content)
       .setAmount(amount * 1000)
       .setLnurl(currentZapper.lnurl)
       .setRecipient(pubkey)
-      .setUrls(relays)
 
-    if (eventId) {
-      writer.setEventId(eventId)
+    if (url) {
+      writer.forceRoutes(relay(url))
+    }
+
+    if (event) {
+      writer.setEvent(event)
     }
 
     const res = await writer.requestInvoice(currentZapper)
@@ -66,9 +64,9 @@
     }
 
     return {
-      relays,
+      relays: await writer.relays(),
       invoice: res.invoice,
-      filters: [currentZapper.getResponseFilter(pubkey, eventId)],
+      filters: [currentZapper.getResponseFilter(pubkey, event?.id)],
     }
   }
 
diff --git a/src/app/components/ZapButton.svelte b/src/app/components/ZapButton.svelte
index 15bfb09b..99c94a89 100644
--- a/src/app/components/ZapButton.svelte
+++ b/src/app/components/ZapButton.svelte
@@ -1,15 +1,13 @@
 <script lang="ts">
   import type {Snippet} from "svelte"
   import {removeUndefined} from "@welshman/lib"
-  import {ZAP_GOAL} from "@welshman/util"
   import type {TrustedEvent} from "@welshman/util"
-  import {ZapGoal} from "@welshman/domain"
   import {Zappers} from "@welshman/app"
   import Button from "@lib/components/Button.svelte"
   import Zap from "@app/components/Zap.svelte"
   import InfoZapperError from "@app/components/InfoZapperError.svelte"
   import {pushModal} from "@app/modal"
-  import {app, reader} from "@app/core"
+  import {app} from "@app/core"
 
   type Props = {
     url?: string
@@ -23,12 +21,8 @@
 
   const {url, event, children, replaceState, ...props}: Props = $props()
 
-  const goal = event.kind === ZAP_GOAL ? reader(ZapGoal)(event) : undefined
-
   const zapperPromise = $app.use(Zappers).loadForPubkey(event.pubkey, removeUndefined([url]))
 
-  const goalRelays = goal?.urls() ?? []
-
   const onClick = async () => {
     loading = true
 
@@ -36,9 +30,9 @@
       const zapper = await zapperPromise
 
       if (zapper?.allowsNostr) {
-        pushModal(Zap, {url, pubkey: event.pubkey, eventId: event.id, goalRelays}, {replaceState})
+        pushModal(Zap, {url, pubkey: event.pubkey, event}, {replaceState})
       } else {
-        pushModal(InfoZapperError, {url, pubkey: event.pubkey, eventId: event.id}, {replaceState})
+        pushModal(InfoZapperError, {url, pubkey: event.pubkey}, {replaceState})
       }
     } finally {
       loading = false