diff --git a/src/components/ComposeBox.tsx b/src/components/ComposeBox.tsx
index f6f7aad2..ac7a01c7 100644
--- a/src/components/ComposeBox.tsx
+++ b/src/components/ComposeBox.tsx
@@ -860,9 +860,11 @@ export function ComposeBox({
           queryClient.invalidateQueries({ queryKey: ['nostr', 'comments'] });
         } else {
           queryClient.invalidateQueries({ queryKey: ['replies', replyTo.id] });
-          // Also invalidate NIP-22 comments cache for non-kind-1 events
+          // Invalidate the event-comments cache used by CommentsSheet
           if (replyTo.kind !== 1) {
-            queryClient.invalidateQueries({ queryKey: ['nostr', 'comments'] });
+            const dTag = replyTo.tags.find(([n]) => n === 'd')?.[1] ?? '';
+            const aTag = `${replyTo.kind}:${replyTo.pubkey}:${dTag}`;
+            queryClient.invalidateQueries({ queryKey: ['event-comments', aTag] });
           }
         }
       }
diff --git a/src/components/ui/toast.tsx b/src/components/ui/toast.tsx
index a8bbf681..5a6dc996 100644
--- a/src/components/ui/toast.tsx
+++ b/src/components/ui/toast.tsx
@@ -14,7 +14,7 @@ const ToastViewport = React.forwardRef<
   <ToastPrimitives.Viewport
     ref={ref}
     className={cn(
-      "fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px] safe-area-top",
+      "fixed top-0 z-[300] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px] safe-area-top",
       className
     )}
     {...props}
diff --git a/src/hooks/useRepostStatus.ts b/src/hooks/useRepostStatus.ts
index 8673caf4..e371077f 100644
--- a/src/hooks/useRepostStatus.ts
+++ b/src/hooks/useRepostStatus.ts
@@ -1,13 +1,12 @@
 import { useNostr } from '@nostrify/react';
-import { useQuery } from '@tanstack/react-query';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
 import { useCurrentUser } from '@/hooks/useCurrentUser';
 
 /**
  * Returns the current user's repost event ID for a given event, if any.
  *
- * Optimistic updates (set by RepostMenu via setQueryData) flow through
- * useQuery's reactive `data` automatically — no separate getQueryData check
- * needed.
+ * Checks the optimistic cache first (set by RepostMenu on repost/unrepost),
+ * then falls back to querying the relay for the user's kind 6 or kind 16 events.
  *
  * Returns:
  * - `undefined` while loading
@@ -17,6 +16,10 @@ import { useCurrentUser } from '@/hooks/useCurrentUser';
 export function useRepostStatus(eventId: string | undefined): string | null | undefined {
   const { nostr } = useNostr();
   const { user } = useCurrentUser();
+  const queryClient = useQueryClient();
+
+  // Check optimistic cache first
+  const optimistic = queryClient.getQueryData<string | null>(['user-repost', eventId ?? '']);
 
   const { data } = useQuery({
     queryKey: ['user-repost', eventId ?? ''],
@@ -37,10 +40,12 @@ export function useRepostStatus(eventId: string | undefined): string | null | un
       if (events.length === 0) return null;
       return events[0].id;
     },
-    enabled: !!eventId && !!user,
+    enabled: !!eventId && !!user && !optimistic,
     staleTime: 5 * 60 * 1000,
     gcTime: 10 * 60 * 1000,
   });
 
+  // Prefer optimistic value, then query result
+  if (optimistic) return optimistic;
   return data;
 }
diff --git a/src/pages/VinesFeedPage.tsx b/src/pages/VinesFeedPage.tsx
index f157cdc2..5f755f37 100644
--- a/src/pages/VinesFeedPage.tsx
+++ b/src/pages/VinesFeedPage.tsx
@@ -152,12 +152,6 @@ export function VineHeartButton({ event, label, noBackground }: { event: NostrEv
     publishEvent(
       { kind: 7, content: '+', tags: [['e', event.id], ['p', event.pubkey], ['k', String(event.kind)]] },
       {
-        onSuccess: () => {
-          setTimeout(() => {
-            queryClient.invalidateQueries({ queryKey: ['event-stats', event.id] });
-            queryClient.invalidateQueries({ queryKey: ['event-interactions', event.id] });
-          }, 3000);
-        },
         onError: () => {
           // Revert optimistic updates
           if (prevStats) {
@@ -216,12 +210,6 @@ export function VineRepostButton({ event, label }: { event: NostrEvent; label?:
       deleteEvent(
         { eventId: repostEventId, eventKind: repostKind },
         {
-          onSuccess: () => {
-            setTimeout(() => {
-              queryClient.invalidateQueries({ queryKey: ['event-stats', event.id] });
-              queryClient.invalidateQueries({ queryKey: ['user-repost', event.id] });
-            }, 3000);
-          },
           onError: () => {
             if (prevStats) queryClient.setQueryData<EventStats>(['event-stats', event.id], prevStats);
             queryClient.setQueryData(['user-repost', event.id], prevRepostStatus);
@@ -250,13 +238,6 @@ export function VineRepostButton({ event, label }: { event: NostrEvent; label?:
       publishEvent(
         { kind: repostKind, content: '', tags },
         {
-          onSuccess: () => {
-            setTimeout(() => {
-              queryClient.invalidateQueries({ queryKey: ['event-stats', event.id] });
-              queryClient.invalidateQueries({ queryKey: ['event-interactions', event.id] });
-              queryClient.invalidateQueries({ queryKey: ['user-repost', event.id] });
-            }, 3000);
-          },
           onError: () => {
             if (prevStats) queryClient.setQueryData<EventStats>(['event-stats', event.id], prevStats);
             queryClient.setQueryData(['user-repost', event.id], null);