diff --git a/app/(app)/event/[naddr]/_components/RSVPButton.tsx b/app/(app)/event/[naddr]/_components/RSVPButton.tsx
index fe81831..80c59bb 100644
--- a/app/(app)/event/[naddr]/_components/RSVPButton.tsx
+++ b/app/(app)/event/[naddr]/_components/RSVPButton.tsx
@@ -88,13 +88,14 @@ export default function RSVPButton({ event }: RSVPButtonProps) {
 
   if (!tickets) {
     if (rsvpEvent) {
-      const rsvpResponse = getTagValues("l", rsvpEvent.tags);
+      const rsvpResponse = getTagValues("status", rsvpEvent.tags);
+      const rsvpResponseDeprecated = getTagValues("l", rsvpEvent.tags);
       return (
         <div className="flex items-center gap-2">
           <Button disabled>
-            {rsvpResponse === "accepted"
+            {rsvpResponse === "accepted" || rsvpResponseDeprecated === "accepted"
               ? "Going"
-              : rsvpResponse === "tentative"
+              : rsvpResponse === "tentative" || rsvpResponseDeprecated === "tentative"
               ? "Tentative"
               : "Not Going"}
           </Button>
diff --git a/components/Modals/RSVP.tsx b/components/Modals/RSVP.tsx
index c9dcd18..48f4932 100644
--- a/components/Modals/RSVP.tsx
+++ b/components/Modals/RSVP.tsx
@@ -41,8 +41,7 @@ export default function RSVPModal({ eventReference }: RSVPModalProps) {
       const tags: string[][] = [
         ["d", random],
         ["a", eventReference],
-        ["L", "status"],
-        ["l", statusMap[type], "status"],
+        ["status", statusMap[type]],
       ];
       const event = await createEvent(ndk, {
         content: "",