diff --git a/components/brain/BrainMobile.tsx b/components/brain/BrainMobile.tsx
index 185b98bd3b..fa0a6276f3 100644
--- a/components/brain/BrainMobile.tsx
+++ b/components/brain/BrainMobile.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import type { ReactNode } from "react";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import React, { useCallback, useMemo, useSyncExternalStore } from "react";
 import { motion, AnimatePresence } from "framer-motion";
 import BrainMobileTabs from "./mobile/BrainMobileTabs";
 import { useRouter, useSearchParams, usePathname } from "next/navigation";
@@ -44,20 +44,14 @@ const BrainMobile: React.FC<Props> = ({ children }) => {
   const pathname = usePathname();
   const { isApp } = useDeviceInfo();
   const { connectedProfile } = useAuth();
-  const {
-    closeQuickVote,
-    isQuickVoteOpen,
-    openQuickVote,
-    prefetchQuickVote,
-    quickVoteSessionId,
-  } = useMemesQuickVoteDialogController();
-  const [hydrated, setHydrated] = useState(false);
+  const quickVote = useMemesQuickVoteDialogController();
+  const hydrated = useSyncExternalStore(
+    () => () => {},
+    () => true,
+    () => false
+  );
   const myStream = useMyStreamOptional();
 
-  useEffect(() => {
-    setHydrated(true);
-  }, []);
-
   const dropId = searchParams.get("drop") ?? undefined;
   const { effectiveDropId, beginClosingDrop } = useClosingDropId(dropId);
   const { data: drop } = useQuery<ApiDrop>({
@@ -115,9 +109,9 @@ const BrainMobile: React.FC<Props> = ({ children }) => {
     waveId,
   });
 
-  const onDropClick = (drop: ExtendedDrop) => {
+  const onDropClick = (selectedDrop: ExtendedDrop) => {
     const params = new URLSearchParams(searchParams.toString() || "");
-    params.set("drop", drop.id);
+    params.set("drop", selectedDrop.id);
     router.push(`${pathname}?${params.toString()}`, { scroll: false });
   };
 
@@ -144,7 +138,7 @@ const BrainMobile: React.FC<Props> = ({ children }) => {
   const closeCreateOverlay = useCallback(() => {
     const params = new URLSearchParams(searchParams.toString() || "");
     params.delete("create");
-    const base = pathname ?? "/";
+    const base = pathname;
     const next = params.toString() ? `${base}?${params.toString()}` : base;
     router.replace(next, { scroll: false });
   }, [router, pathname, searchParams]);
@@ -186,7 +180,7 @@ const BrainMobile: React.FC<Props> = ({ children }) => {
     !isDropOpen &&
     !isDm;
   const shouldMountQuickVoteDialog =
-    isQuickVoteOpen ||
+    quickVote.isQuickVoteOpen ||
     shouldMountFloatingQuickVoteEntry ||
     activeView === BrainView.WAVES;
 
@@ -232,8 +226,8 @@ const BrainMobile: React.FC<Props> = ({ children }) => {
         >
           {shouldMountFloatingQuickVoteEntry && (
             <FloatingMemesQuickVoteTrigger
-              onOpenQuickVote={openQuickVote}
-              onPrefetchQuickVote={prefetchQuickVote}
+              onOpenQuickVote={quickVote.openQuickVote}
+              onPrefetchQuickVote={quickVote.prefetchQuickVote}
             />
           )}
           <BrainMobileViewContent
@@ -243,8 +237,8 @@ const BrainMobile: React.FC<Props> = ({ children }) => {
             isMemesWave={isMemesWave}
             isRankWave={isRankWave}
             onDropClick={onDropClick}
-            onOpenQuickVote={openQuickVote}
-            onPrefetchQuickVote={prefetchQuickVote}
+            onOpenQuickVote={quickVote.openQuickVote}
+            onPrefetchQuickVote={quickVote.prefetchQuickVote}
             wave={wave}
           >
             {children}
@@ -252,11 +246,7 @@ const BrainMobile: React.FC<Props> = ({ children }) => {
         </motion.div>
       </AnimatePresence>
       {shouldMountQuickVoteDialog && (
-        <MemesQuickVoteDialog
-          isOpen={isQuickVoteOpen}
-          sessionId={quickVoteSessionId}
-          onClose={closeQuickVote}
-        />
+        <MemesQuickVoteDialog {...quickVote.dialogState} />
       )}
     </div>
   );
diff --git a/components/brain/left-sidebar/waves/MemesWaveFooter.tsx b/components/brain/left-sidebar/waves/MemesWaveFooter.tsx
index 1abee6e072..885758ec10 100644
--- a/components/brain/left-sidebar/waves/MemesWaveFooter.tsx
+++ b/components/brain/left-sidebar/waves/MemesWaveFooter.tsx
@@ -23,11 +23,23 @@ const MemesWaveFooter: React.FC<MemesWaveFooterProps> = ({
   onOpenQuickVote,
   onPrefetchQuickVote,
 }) => {
-  const { isReady, uncastPower, unratedCount, votingLabel } =
+  const { isAvailable, isReady, uncastPower, unratedCount, votingLabel } =
     useMemesWaveFooterStats();
+  const buttonAriaLabel =
+    isReady && typeof uncastPower === "number"
+      ? `Uncast Power, ${formatNumberWithCommas(uncastPower)} ${
+          votingLabel ?? "Votes"
+        } left, ${formatNumberWithCommas(unratedCount)} unrated`
+      : "Quick vote";
+  const buttonTitle = isReady ? "Uncast votes" : "Quick vote";
+  const votingPowerLabel = votingLabel ? ` ${votingLabel}` : " votes";
+  const buttonValue =
+    isReady && typeof uncastPower === "number"
+      ? `${formatNumberWithCommas(uncastPower)}${votingPowerLabel}`
+      : "Open quick vote";
 
   const handleOpenQuickVote = () => {
-    if (unratedCount <= 0) {
+    if (!isAvailable) {
       return;
     }
 
@@ -35,7 +47,7 @@ const MemesWaveFooter: React.FC<MemesWaveFooterProps> = ({
   };
 
   const handlePrefetchQuickVote = () => {
-    if (unratedCount <= 0) {
+    if (!isAvailable) {
       return;
     }
 
@@ -44,7 +56,7 @@ const MemesWaveFooter: React.FC<MemesWaveFooterProps> = ({
 
   return (
     <AnimatePresence>
-      {isReady && typeof uncastPower === "number" && (
+      {isAvailable && (
         <motion.div
           initial={{ opacity: 0, y: 16 }}
           animate={{ opacity: 1, y: 0 }}
@@ -58,6 +70,7 @@ const MemesWaveFooter: React.FC<MemesWaveFooterProps> = ({
         >
           {collapsed ? (
             <MemesWaveQuickVoteTrigger
+              isAvailable={isAvailable}
               onOpenQuickVote={handleOpenQuickVote}
               onPrefetchQuickVote={handlePrefetchQuickVote}
               unratedCount={unratedCount}
@@ -65,11 +78,7 @@ const MemesWaveFooter: React.FC<MemesWaveFooterProps> = ({
           ) : (
             <button
               type="button"
-              aria-label={`Uncast Power, ${formatNumberWithCommas(
-                uncastPower
-              )} ${votingLabel ?? "Votes"} left, ${formatNumberWithCommas(
-                unratedCount
-              )} unexplored`}
+              aria-label={buttonAriaLabel}
               onClick={handleOpenQuickVote}
               onFocus={handlePrefetchQuickVote}
               onMouseEnter={handlePrefetchQuickVote}
@@ -82,21 +91,22 @@ const MemesWaveFooter: React.FC<MemesWaveFooterProps> = ({
                 />
                 <div className="tw-relative tw-z-10 tw-flex tw-min-w-0 tw-flex-col tw-gap-1.5">
                   <span className="tw-text-[10px] tw-font-bold tw-uppercase tw-tracking-widest tw-text-[#6b7c93]">
-                    Uncast votes
+                    {buttonTitle}
                   </span>
 
                   <div className="tw-flex tw-items-center tw-gap-2">
                     <MemesWaveZapIcon className="tw-size-4 tw-flex-shrink-0 tw-fill-primary-400/20 tw-text-primary-400" />
                     <span className="tw-truncate tw-text-sm tw-font-semibold tw-tracking-tight tw-text-white">
-                      {formatNumberWithCommas(uncastPower)}
-                      {votingLabel ? ` ${votingLabel}` : " votes"}
+                      {buttonValue}
                     </span>
                   </div>
                 </div>
 
-                <span className="tw-relative tw-z-10 tw-text-xs tw-font-semibold tw-text-[#8199ea] tw-shadow-sm">
-                  {formatNumberWithCommas(unratedCount)} unexplored
-                </span>
+                {isReady && (
+                  <span className="tw-relative tw-z-10 tw-text-xs tw-font-semibold tw-text-[#8199ea] tw-shadow-sm">
+                    {formatNumberWithCommas(unratedCount)} unrated
+                  </span>
+                )}
               </div>
             </button>
           )}
diff --git a/components/brain/left-sidebar/waves/MemesWaveQuickVoteTrigger.tsx b/components/brain/left-sidebar/waves/MemesWaveQuickVoteTrigger.tsx
index 78c2663804..6a4cc42fcf 100644
--- a/components/brain/left-sidebar/waves/MemesWaveQuickVoteTrigger.tsx
+++ b/components/brain/left-sidebar/waves/MemesWaveQuickVoteTrigger.tsx
@@ -5,6 +5,7 @@ import { formatNumberWithCommas } from "@/helpers/Helpers";
 import React from "react";
 
 interface MemesWaveQuickVoteTriggerProps {
+  readonly isAvailable?: boolean | undefined;
   readonly className?: string | undefined;
   readonly onOpenQuickVote: () => void;
   readonly onPrefetchQuickVote?: (() => void) | undefined;
@@ -12,20 +13,27 @@ interface MemesWaveQuickVoteTriggerProps {
 }
 
 const MemesWaveQuickVoteTrigger: React.FC<MemesWaveQuickVoteTriggerProps> = ({
+  isAvailable = true,
   className,
   onOpenQuickVote,
   onPrefetchQuickVote,
   unratedCount,
 }) => {
-  if (unratedCount <= 0) {
+  if (!isAvailable) {
     return null;
   }
 
+  const label =
+    unratedCount > 0
+      ? `${unratedCount} unrated submissions in the memes wave`
+      : "Quick vote";
+  const title = unratedCount > 0 ? `${unratedCount} unrated` : "Quick vote";
+
   return (
     <button
       type="button"
-      aria-label={`${unratedCount} submissions left unrated in memes wave`}
-      title={`${unratedCount} left`}
+      aria-label={label}
+      title={title}
       onClick={onOpenQuickVote}
       onFocus={onPrefetchQuickVote}
       onMouseEnter={onPrefetchQuickVote}
@@ -34,9 +42,11 @@ const MemesWaveQuickVoteTrigger: React.FC<MemesWaveQuickVoteTriggerProps> = ({
       }`}
     >
       <MemesWaveZapIcon className="tw-size-4 tw-flex-shrink-0 tw-fill-primary-300/20" />
-      <span className="tw-text-xs tw-font-semibold">
-        {formatNumberWithCommas(unratedCount)}
-      </span>
+      {unratedCount > 0 && (
+        <span className="tw-text-xs tw-font-semibold">
+          {formatNumberWithCommas(unratedCount)}
+        </span>
+      )}
     </button>
   );
 };
diff --git a/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVoteControls.tsx b/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVoteControls.tsx
index 106dc46d55..456ffb7558 100644
--- a/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVoteControls.tsx
+++ b/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVoteControls.tsx
@@ -61,7 +61,7 @@ export default function MemesQuickVoteControls({
     >
       <div className="tw-hidden tw-shrink-0 tw-flex-wrap tw-gap-2 tw-px-8 md:tw-flex md:tw-pb-6 md:tw-pt-6">
         <span className="tw-rounded-full tw-border tw-border-solid tw-border-white/5 tw-bg-white/[0.03] tw-px-4 tw-py-1.5 tw-text-[13px] tw-font-bold tw-text-iron-300 tw-shadow-sm tw-backdrop-blur-md">
-          {formatNumberWithCommas(remainingCount)} unexplored
+          {formatNumberWithCommas(remainingCount)} unrated
         </span>
       </div>
 
diff --git a/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVoteDialog.tsx b/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVoteDialog.tsx
index 44505c6eac..1b04f9974d 100644
--- a/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVoteDialog.tsx
+++ b/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVoteDialog.tsx
@@ -5,8 +5,8 @@ import {
   getDefaultQuickVoteAmount,
   normalizeQuickVoteAmount,
 } from "@/hooks/memesQuickVote.helpers";
+import type { MemesQuickVoteDialogState } from "@/hooks/useMemesQuickVoteDialogController";
 import { useMediaQuery } from "@/hooks/useMediaQuery";
-import { useMemesQuickVoteQueue } from "@/hooks/useMemesQuickVoteQueue";
 import { XMarkIcon } from "@heroicons/react/24/outline";
 import { CheckCircleIcon } from "@heroicons/react/24/solid";
 import {
@@ -27,23 +27,17 @@ const QUICK_VOTE_BAR_FEEDBACK_DURATION_MS = 650;
 type VoteFeedbackSource = "custom-submit" | "quick-amount";
 type TimeoutHandle = ReturnType<typeof globalThis.setTimeout>;
 
-interface MemesQuickVoteDialogProps {
-  readonly isOpen: boolean;
-  readonly sessionId: number;
-  readonly onClose: () => void;
-}
+type MemesQuickVoteDialogProps = MemesQuickVoteDialogState;
 
 interface MemesQuickVoteDialogContentProps {
-  readonly activeDrop: NonNullable<
-    ReturnType<typeof useMemesQuickVoteQueue>["activeDrop"]
-  >;
+  readonly activeDrop: NonNullable<MemesQuickVoteDialogProps["activeDrop"]>;
   readonly isMobile: boolean;
   readonly latestUsedAmount: number | null;
   readonly onClose: () => void;
   readonly remainingCount: number;
   readonly recentAmounts: number[];
-  readonly submitVote: ReturnType<typeof useMemesQuickVoteQueue>["submitVote"];
-  readonly skipDrop: ReturnType<typeof useMemesQuickVoteQueue>["skipDrop"];
+  readonly submitVote: MemesQuickVoteDialogProps["submitVote"];
+  readonly skipDrop: MemesQuickVoteDialogProps["skipDrop"];
   readonly uncastPower: number | null;
   readonly votingLabel: string | null;
 }
@@ -169,9 +163,17 @@ function MemesQuickVoteDialogContent({
     ]
   );
 
-  const queueSkip = () => {
-    skipDrop(activeDrop);
-  };
+  const queueSkip = useCallback(() => {
+    skipDrop(activeDrop)
+      .then((wasQueued) => {
+        if (!wasQueued) {
+          setIsAdvancing(false);
+        }
+      })
+      .catch(() => {
+        setIsAdvancing(false);
+      });
+  }, [activeDrop, skipDrop]);
 
   const handleSkip = () => {
     if (isControlsSubmitting) {
@@ -198,7 +200,7 @@ function MemesQuickVoteDialogContent({
 
           <div className="tw-flex tw-min-w-0 tw-flex-col tw-items-center tw-justify-center tw-px-3">
             <span className="tw-truncate tw-text-[13px] tw-font-bold tw-leading-tight tw-text-iron-300">
-              {formatNumberWithCommas(remainingCount)} unexplored
+              {formatNumberWithCommas(remainingCount)} unrated
             </span>
           </div>
 
@@ -211,7 +213,7 @@ function MemesQuickVoteDialogContent({
           <div className="tw-min-h-0 tw-flex-1">
             <MemesQuickVotePreview
               drop={activeDrop}
-              isBusy={isAdvancing}
+              isBusy={isControlsSubmitting}
               isMobile={isMobile}
               remainingCount={remainingCount}
               swipeVoteAmount={swipeVoteAmount}
@@ -227,6 +229,7 @@ function MemesQuickVoteDialogContent({
                   return;
                 }
 
+                setIsAdvancing(true);
                 queueVoteAmount(swipeVoteAmount);
               }}
             />
@@ -272,7 +275,7 @@ function MemesQuickVoteDialogContent({
           <div className="tw-min-h-0 tw-flex-1 md:tw-min-h-0 md:tw-border-y-0 md:tw-border-b-0 md:tw-border-l-0 md:tw-border-r md:tw-border-solid md:tw-border-white/10">
             <MemesQuickVotePreview
               drop={activeDrop}
-              isBusy={isAdvancing}
+              isBusy={isControlsSubmitting}
               isMobile={isMobile}
               remainingCount={remainingCount}
               swipeVoteAmount={swipeVoteAmount}
@@ -288,6 +291,7 @@ function MemesQuickVoteDialogContent({
                   return;
                 }
 
+                setIsAdvancing(true);
                 queueVoteAmount(swipeVoteAmount);
               }}
             />
@@ -381,10 +385,10 @@ function MemesQuickVoteDialogErrorState({
     <div className="tw-flex tw-min-h-full tw-items-center tw-justify-center tw-py-8">
       <div className="tw-w-full tw-max-w-xl tw-rounded-[1.75rem] tw-border tw-border-solid tw-border-white/10 tw-bg-white/[0.03] tw-px-6 tw-py-10 tw-text-center tw-shadow-[0_24px_60px_rgba(0,0,0,0.35)] tw-backdrop-blur-sm">
         <p className="tw-mb-2 tw-text-lg tw-font-semibold tw-text-white">
-          Couldn&apos;t load your queue
+          Couldn&apos;t load quick vote
         </p>
         <p className="tw-mb-4 tw-text-sm tw-text-iron-400">
-          Quick vote couldn&apos;t reach the leaderboard. Try again.
+          Quick vote couldn&apos;t load the next meme. Try again.
         </p>
         <button
           type="button"
@@ -402,25 +406,22 @@ export default function MemesQuickVoteDialog({
   isOpen,
   sessionId,
   onClose,
+  activeDrop,
+  hasDiscoveryError,
+  isExhausted,
+  latestUsedAmount,
+  recentAmounts,
+  remainingCount,
+  retryDiscovery,
+  submitVote,
+  skipDrop,
+  uncastPower,
+  votingLabel,
 }: MemesQuickVoteDialogProps) {
   const dialogRef = useRef<HTMLDialogElement | null>(null);
   const previouslyFocusedElementRef = useRef<HTMLElement | null>(null);
   const previousBodyOverflowRef = useRef("");
   const isMobile = useMediaQuery(QUICK_VOTE_MOBILE_QUERY);
-  const {
-    activeDrop,
-    hasDiscoveryError,
-    isExhausted,
-    isLoading,
-    latestUsedAmount,
-    recentAmounts,
-    remainingCount,
-    retryDiscovery,
-    submitVote,
-    skipDrop,
-    uncastPower,
-    votingLabel,
-  } = useMemesQuickVoteQueue({ enabled: isOpen, sessionId });
 
   useEffect(() => {
     const dialog = dialogRef.current;
@@ -483,14 +484,12 @@ export default function MemesQuickVoteDialog({
     dialogBody = <MemesQuickVoteDialogDoneState onClose={onClose} />;
   } else if (!activeDrop && hasDiscoveryError) {
     dialogBody = <MemesQuickVoteDialogErrorState onRetry={retryDiscovery} />;
-  } else if (!activeDrop && isLoading) {
-    dialogBody = <MemesQuickVoteDialogSkeleton />;
   } else if (!activeDrop) {
     dialogBody = <MemesQuickVoteDialogSkeleton />;
   } else {
     dialogBody = (
       <MemesQuickVoteDialogContent
-        key={`${sessionId}:${activeDrop.serial_no}:${isOpen ? "open" : "closed"}`}
+        key={`${sessionId}:${activeDrop.id}:${isOpen ? "open" : "closed"}`}
         activeDrop={activeDrop}
         isMobile={isMobile}
         latestUsedAmount={latestUsedAmount}
diff --git a/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVoteDialogSkeleton.tsx b/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVoteDialogSkeleton.tsx
index a7787a79ac..bed10d20b6 100644
--- a/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVoteDialogSkeleton.tsx
+++ b/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVoteDialogSkeleton.tsx
@@ -74,8 +74,7 @@ export default function MemesQuickVoteDialogSkeleton() {
       className="tw-flex tw-h-full tw-flex-col md:tw-grid md:tw-min-h-0 md:tw-grid-cols-[minmax(0,1.22fr)_minmax(25rem,1fr)] md:tw-items-stretch"
     >
       <p className="tw-sr-only">
-        Loading your queue. Pulling unrated memes and your recent quick-vote
-        amounts.
+        Loading your next meme and your recent quick-vote amounts.
       </p>
 
       <div data-testid="quick-vote-preview-status" className="tw-hidden">
diff --git a/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVotePreview.tsx b/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVotePreview.tsx
index 4b1b816a87..1354b05b95 100644
--- a/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVotePreview.tsx
+++ b/components/brain/left-sidebar/waves/memes-quick-vote/MemesQuickVotePreview.tsx
@@ -324,7 +324,7 @@ function MemesQuickVotePreviewContent({
           aria-hidden="true"
           className="tw-rounded-full tw-border tw-border-solid tw-border-white/5 tw-bg-white/[0.03] tw-px-4 tw-py-1.5 tw-text-[13px] tw-font-bold tw-text-iron-300 tw-shadow-sm tw-backdrop-blur-md"
         >
-          {formatNumberWithCommas(remainingCount)} unexplored
+          {formatNumberWithCommas(remainingCount)} unrated
         </span>
       </div>
 
diff --git a/components/brain/left-sidebar/web/WebLeftSidebar.tsx b/components/brain/left-sidebar/web/WebLeftSidebar.tsx
index 433a38533c..cf897863f4 100644
--- a/components/brain/left-sidebar/web/WebLeftSidebar.tsx
+++ b/components/brain/left-sidebar/web/WebLeftSidebar.tsx
@@ -27,28 +27,18 @@ interface WebLeftSidebarProps {
 const WebLeftSidebarQuickVoteOwner: React.FC<{
   readonly isCollapsed: boolean;
 }> = ({ isCollapsed }) => {
-  const {
-    closeQuickVote,
-    isQuickVoteOpen,
-    openQuickVote,
-    prefetchQuickVote,
-    quickVoteSessionId,
-  } = useMemesQuickVoteDialogController();
+  const quickVote = useMemesQuickVoteDialogController();
 
   return (
     <>
       <div className="tw-flex-shrink-0 tw-bg-black">
         <MemesWaveFooter
           collapsed={isCollapsed}
-          onOpenQuickVote={openQuickVote}
-          onPrefetchQuickVote={prefetchQuickVote}
+          onOpenQuickVote={quickVote.openQuickVote}
+          onPrefetchQuickVote={quickVote.prefetchQuickVote}
         />
       </div>
-      <MemesQuickVoteDialog
-        isOpen={isQuickVoteOpen}
-        sessionId={quickVoteSessionId}
-        onClose={closeQuickVote}
-      />
+      <MemesQuickVoteDialog {...quickVote.dialogState} />
     </>
   );
 };
diff --git a/components/brain/mobile/FloatingMemesQuickVoteTrigger.tsx b/components/brain/mobile/FloatingMemesQuickVoteTrigger.tsx
index c446932712..26542e52ab 100644
--- a/components/brain/mobile/FloatingMemesQuickVoteTrigger.tsx
+++ b/components/brain/mobile/FloatingMemesQuickVoteTrigger.tsx
@@ -12,15 +12,16 @@ export default function FloatingMemesQuickVoteTrigger({
   onOpenQuickVote,
   onPrefetchQuickVote,
 }: FloatingMemesQuickVoteTriggerProps) {
-  const { isReady, uncastPower, unratedCount } = useMemesWaveFooterStats();
+  const { isAvailable, unratedCount } = useMemesWaveFooterStats();
 
-  if (!isReady || typeof uncastPower !== "number" || unratedCount <= 0) {
+  if (!isAvailable) {
     return null;
   }
 
   return (
     <div className="tw-absolute tw-right-2 tw-top-2 tw-z-20 sm:tw-right-4 sm:tw-top-3">
       <MemesWaveQuickVoteTrigger
+        isAvailable={isAvailable}
         onOpenQuickVote={onOpenQuickVote}
         onPrefetchQuickVote={onPrefetchQuickVote}
         unratedCount={unratedCount}
diff --git a/components/layout/AppLayout.tsx b/components/layout/AppLayout.tsx
index 143e475632..cabd9d550b 100644
--- a/components/layout/AppLayout.tsx
+++ b/components/layout/AppLayout.tsx
@@ -32,25 +32,15 @@ interface Props {
 }
 
 function WavesQuickVoteView() {
-  const {
-    closeQuickVote,
-    isQuickVoteOpen,
-    openQuickVote,
-    prefetchQuickVote,
-    quickVoteSessionId,
-  } = useMemesQuickVoteDialogController();
+  const quickVote = useMemesQuickVoteDialogController();
 
   return (
     <>
       <BrainMobileWaves
-        onOpenQuickVote={openQuickVote}
-        onPrefetchQuickVote={prefetchQuickVote}
-      />
-      <MemesQuickVoteDialog
-        isOpen={isQuickVoteOpen}
-        sessionId={quickVoteSessionId}
-        onClose={closeQuickVote}
+        onOpenQuickVote={quickVote.openQuickVote}
+        onPrefetchQuickVote={quickVote.prefetchQuickVote}
       />
+      <MemesQuickVoteDialog {...quickVote.dialogState} />
     </>
   );
 }
@@ -102,6 +92,15 @@ export default function AppLayout({ children }: Props) {
     !isNavVisible && !isKeyboardVisible
       ? "tw-pb-[env(safe-area-inset-bottom,0px)]"
       : "";
+  let activeContent: ReactNode;
+
+  if (activeView === "messages") {
+    activeContent = <BrainMobileMessages />;
+  } else if (activeView === "waves") {
+    activeContent = <WavesQuickVoteView />;
+  } else {
+    activeContent = <main>{children}</main>;
+  }
 
   return (
     <div className={`${safeAreaClass} ${"tw-overflow-auto"}`}>
@@ -109,13 +108,7 @@ export default function AppLayout({ children }: Props) {
       <div ref={headerWrapperRef}>
         <TouchDeviceHeader />
       </div>
-      {activeView === "messages" ? (
-        <BrainMobileMessages />
-      ) : activeView === "waves" ? (
-        <WavesQuickVoteView />
-      ) : (
-        <main>{children}</main>
-      )}
+      {activeContent}
       {!isSingleDropOpen && !isStreamRoute && (
         <div className="tw-h-[85px] tw-w-full" />
       )}
diff --git a/generated/models/ApiCreateNewWaveParticipationConfig.ts b/generated/models/ApiCreateNewWaveParticipationConfig.ts
index 9c6e0df1dd..b2ccaaa3b4 100644
--- a/generated/models/ApiCreateNewWaveParticipationConfig.ts
+++ b/generated/models/ApiCreateNewWaveParticipationConfig.ts
@@ -14,7 +14,6 @@
 import { ApiCreateNewWaveScope } from '../models/ApiCreateNewWaveScope';
 import { ApiIntRange } from '../models/ApiIntRange';
 import { ApiWaveParticipationRequirement } from '../models/ApiWaveParticipationRequirement';
-import { ApiWaveParticipationSubmissionStrategy } from '../models/ApiWaveParticipationSubmissionStrategy';
 import { ApiWaveRequiredMetadata } from '../models/ApiWaveRequiredMetadata';
 import { HttpFile } from '../http/http';
 
@@ -38,7 +37,6 @@ export class ApiCreateNewWaveParticipationConfig {
     */
     'terms': string | null;
     'period'?: ApiIntRange;
-    'submission_strategy'?: ApiWaveParticipationSubmissionStrategy | null;
 
     static readonly discriminator: string | undefined = undefined;
 
@@ -86,12 +84,6 @@ export class ApiCreateNewWaveParticipationConfig {
             "baseName": "period",
             "type": "ApiIntRange",
             "format": ""
-        },
-        {
-            "name": "submission_strategy",
-            "baseName": "submission_strategy",
-            "type": "ApiWaveParticipationSubmissionStrategy",
-            "format": ""
         }    ];
 
     static getAttributeTypeMap() {
diff --git a/generated/models/ApiDrop.ts b/generated/models/ApiDrop.ts
index f8edf00621..19f7a2f066 100644
--- a/generated/models/ApiDrop.ts
+++ b/generated/models/ApiDrop.ts
@@ -13,7 +13,7 @@
 
 import { ApiDropContextProfileContext } from '../models/ApiDropContextProfileContext';
 import { ApiDropMentionedUser } from '../models/ApiDropMentionedUser';
-import { ApiDropMetadataResponse } from '../models/ApiDropMetadataResponse';
+import { ApiDropMetadata } from '../models/ApiDropMetadata';
 import { ApiDropNftLink } from '../models/ApiDropNftLink';
 import { ApiDropPart } from '../models/ApiDropPart';
 import { ApiDropRater } from '../models/ApiDropRater';
@@ -57,7 +57,7 @@ export class ApiDrop {
     'referenced_nfts': Array<ApiDropReferencedNFT>;
     'mentioned_users': Array<ApiDropMentionedUser>;
     'mentioned_waves': Array<ApiMentionedWave>;
-    'metadata': Array<ApiDropMetadataResponse>;
+    'metadata': Array<ApiDropMetadata>;
     'rating': number;
     'realtime_rating': number;
     'rating_prediction': number;
@@ -175,7 +175,7 @@ export class ApiDrop {
         {
             "name": "metadata",
             "baseName": "metadata",
-            "type": "Array<ApiDropMetadataResponse>",
+            "type": "Array<ApiDropMetadata>",
             "format": ""
         },
         {
diff --git a/generated/models/ApiDropRatingRequest.ts b/generated/models/ApiDropRatingRequest.ts
index eb6bd91a57..6313db8f48 100644
--- a/generated/models/ApiDropRatingRequest.ts
+++ b/generated/models/ApiDropRatingRequest.ts
@@ -15,7 +15,7 @@ import { HttpFile } from '../http/http';
 
 export class ApiDropRatingRequest {
     'rating': number;
-    'category': string;
+    'category'?: string | null;
 
     static readonly discriminator: string | undefined = undefined;
 
diff --git a/generated/models/ApiDropWithoutWave.ts b/generated/models/ApiDropWithoutWave.ts
index 098947cea1..7cefd7bd5f 100644
--- a/generated/models/ApiDropWithoutWave.ts
+++ b/generated/models/ApiDropWithoutWave.ts
@@ -13,7 +13,7 @@
 
 import { ApiDropContextProfileContext } from '../models/ApiDropContextProfileContext';
 import { ApiDropMentionedUser } from '../models/ApiDropMentionedUser';
-import { ApiDropMetadataResponse } from '../models/ApiDropMetadataResponse';
+import { ApiDropMetadata } from '../models/ApiDropMetadata';
 import { ApiDropNftLink } from '../models/ApiDropNftLink';
 import { ApiDropPart } from '../models/ApiDropPart';
 import { ApiDropRater } from '../models/ApiDropRater';
@@ -55,7 +55,7 @@ export class ApiDropWithoutWave {
     'referenced_nfts': Array<ApiDropReferencedNFT>;
     'mentioned_users': Array<ApiDropMentionedUser>;
     'mentioned_waves': Array<ApiMentionedWave>;
-    'metadata': Array<ApiDropMetadataResponse>;
+    'metadata': Array<ApiDropMetadata>;
     'rating': number;
     'realtime_rating': number;
     'rating_prediction': number;
@@ -167,7 +167,7 @@ export class ApiDropWithoutWave {
         {
             "name": "metadata",
             "baseName": "metadata",
-            "type": "Array<ApiDropMetadataResponse>",
+            "type": "Array<ApiDropMetadata>",
             "format": ""
         },
         {
diff --git a/generated/models/ApiDropMetadataResponse.ts b/generated/models/ApiUndiscoveredDrop.ts
similarity index 57%
rename from generated/models/ApiDropMetadataResponse.ts
rename to generated/models/ApiUndiscoveredDrop.ts
index 5bdec250a0..3f6e253edc 100644
--- a/generated/models/ApiDropMetadataResponse.ts
+++ b/generated/models/ApiUndiscoveredDrop.ts
@@ -11,13 +11,12 @@
  * Do not edit the class manually.
  */
 
-import { ApiProfileMin } from '../models/ApiProfileMin';
+import { ApiDrop } from '../models/ApiDrop';
 import { HttpFile } from '../http/http';
 
-export class ApiDropMetadataResponse {
-    'data_key': string;
-    'data_value': string;
-    'resolved_profile'?: ApiProfileMin | null;
+export class ApiUndiscoveredDrop {
+    'drop': ApiDrop | null;
+    'total_count': number;
 
     static readonly discriminator: string | undefined = undefined;
 
@@ -25,26 +24,20 @@ export class ApiDropMetadataResponse {
 
     static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
         {
-            "name": "data_key",
-            "baseName": "data_key",
-            "type": "string",
+            "name": "drop",
+            "baseName": "drop",
+            "type": "ApiDrop",
             "format": ""
         },
         {
-            "name": "data_value",
-            "baseName": "data_value",
-            "type": "string",
-            "format": ""
-        },
-        {
-            "name": "resolved_profile",
-            "baseName": "resolved_profile",
-            "type": "ApiProfileMin",
-            "format": ""
+            "name": "total_count",
+            "baseName": "total_count",
+            "type": "number",
+            "format": "int64"
         }    ];
 
     static getAttributeTypeMap() {
-        return ApiDropMetadataResponse.attributeTypeMap;
+        return ApiUndiscoveredDrop.attributeTypeMap;
     }
 
     public constructor() {
diff --git a/generated/models/ApiUpdateWaveParticipationConfig.ts b/generated/models/ApiUpdateWaveParticipationConfig.ts
deleted file mode 100644
index 974a949089..0000000000
--- a/generated/models/ApiUpdateWaveParticipationConfig.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-// @ts-nocheck
-/**
- * 6529.io API
- * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { ApiCreateNewWaveScope } from '../models/ApiCreateNewWaveScope';
-import { ApiIntRange } from '../models/ApiIntRange';
-import { ApiWaveParticipationRequirement } from '../models/ApiWaveParticipationRequirement';
-import { ApiWaveParticipationSubmissionStrategy } from '../models/ApiWaveParticipationSubmissionStrategy';
-import { ApiWaveRequiredMetadata } from '../models/ApiWaveRequiredMetadata';
-import { HttpFile } from '../http/http';
-
-export class ApiUpdateWaveParticipationConfig {
-    'scope': ApiCreateNewWaveScope;
-    /**
-    * The number of applications allowed per participant. Infinite if omitted.
-    */
-    'no_of_applications_allowed_per_participant': number | null;
-    'required_media': Array<ApiWaveParticipationRequirement>;
-    /**
-    * The metadata that must be provided by the participant.  Empty array if nothing is required. 
-    */
-    'required_metadata': Array<ApiWaveRequiredMetadata>;
-    /**
-    * If true then the votes must be signed by voters.
-    */
-    'signature_required': boolean;
-    /**
-    * If this is and the \"signature_required\" is set then this will be embedded as a signature input data component for each drop.
-    */
-    'terms': string | null;
-    'period'?: ApiIntRange;
-    'submission_strategy'?: ApiWaveParticipationSubmissionStrategy | null;
-
-    static readonly discriminator: string | undefined = undefined;
-
-    static readonly mapping: {[index: string]: string} | undefined = undefined;
-
-    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
-        {
-            "name": "scope",
-            "baseName": "scope",
-            "type": "ApiCreateNewWaveScope",
-            "format": ""
-        },
-        {
-            "name": "no_of_applications_allowed_per_participant",
-            "baseName": "no_of_applications_allowed_per_participant",
-            "type": "number",
-            "format": "int64"
-        },
-        {
-            "name": "required_media",
-            "baseName": "required_media",
-            "type": "Array<ApiWaveParticipationRequirement>",
-            "format": ""
-        },
-        {
-            "name": "required_metadata",
-            "baseName": "required_metadata",
-            "type": "Array<ApiWaveRequiredMetadata>",
-            "format": ""
-        },
-        {
-            "name": "signature_required",
-            "baseName": "signature_required",
-            "type": "boolean",
-            "format": ""
-        },
-        {
-            "name": "terms",
-            "baseName": "terms",
-            "type": "string",
-            "format": ""
-        },
-        {
-            "name": "period",
-            "baseName": "period",
-            "type": "ApiIntRange",
-            "format": ""
-        },
-        {
-            "name": "submission_strategy",
-            "baseName": "submission_strategy",
-            "type": "ApiWaveParticipationSubmissionStrategy",
-            "format": ""
-        }    ];
-
-    static getAttributeTypeMap() {
-        return ApiUpdateWaveParticipationConfig.attributeTypeMap;
-    }
-
-    public constructor() {
-    }
-}
diff --git a/generated/models/ApiUpdateWaveRequest.ts b/generated/models/ApiUpdateWaveRequest.ts
index 7228de592c..f6d9e4dd85 100644
--- a/generated/models/ApiUpdateWaveRequest.ts
+++ b/generated/models/ApiUpdateWaveRequest.ts
@@ -12,10 +12,10 @@
  */
 
 import { ApiCreateNewWaveChatConfig } from '../models/ApiCreateNewWaveChatConfig';
+import { ApiCreateNewWaveParticipationConfig } from '../models/ApiCreateNewWaveParticipationConfig';
 import { ApiCreateNewWaveVisibilityConfig } from '../models/ApiCreateNewWaveVisibilityConfig';
 import { ApiCreateNewWaveVotingConfig } from '../models/ApiCreateNewWaveVotingConfig';
 import { ApiCreateWaveConfig } from '../models/ApiCreateWaveConfig';
-import { ApiUpdateWaveParticipationConfig } from '../models/ApiUpdateWaveParticipationConfig';
 import { HttpFile } from '../http/http';
 
 export class ApiUpdateWaveRequest {
@@ -29,7 +29,7 @@ export class ApiUpdateWaveRequest {
     'picture': string | null;
     'voting': ApiCreateNewWaveVotingConfig;
     'visibility': ApiCreateNewWaveVisibilityConfig;
-    'participation': ApiUpdateWaveParticipationConfig;
+    'participation': ApiCreateNewWaveParticipationConfig;
     'chat': ApiCreateNewWaveChatConfig;
     'wave': ApiCreateWaveConfig;
 
@@ -65,7 +65,7 @@ export class ApiUpdateWaveRequest {
         {
             "name": "participation",
             "baseName": "participation",
-            "type": "ApiUpdateWaveParticipationConfig",
+            "type": "ApiCreateNewWaveParticipationConfig",
             "format": ""
         },
         {
diff --git a/generated/models/ApiWaveParticipationConfig.ts b/generated/models/ApiWaveParticipationConfig.ts
index b9082bfe6b..e1192b60c3 100644
--- a/generated/models/ApiWaveParticipationConfig.ts
+++ b/generated/models/ApiWaveParticipationConfig.ts
@@ -13,7 +13,6 @@
 
 import { ApiIntRange } from '../models/ApiIntRange';
 import { ApiWaveParticipationRequirement } from '../models/ApiWaveParticipationRequirement';
-import { ApiWaveParticipationSubmissionStrategy } from '../models/ApiWaveParticipationSubmissionStrategy';
 import { ApiWaveRequiredMetadata } from '../models/ApiWaveRequiredMetadata';
 import { ApiWaveScope } from '../models/ApiWaveScope';
 import { HttpFile } from '../http/http';
@@ -36,7 +35,6 @@ export class ApiWaveParticipationConfig {
     'period'?: ApiIntRange;
     'authenticated_user_eligible': boolean;
     'terms': string | null;
-    'submission_strategy'?: ApiWaveParticipationSubmissionStrategy | null;
 
     static readonly discriminator: string | undefined = undefined;
 
@@ -90,12 +88,6 @@ export class ApiWaveParticipationConfig {
             "baseName": "terms",
             "type": "string",
             "format": ""
-        },
-        {
-            "name": "submission_strategy",
-            "baseName": "submission_strategy",
-            "type": "ApiWaveParticipationSubmissionStrategy",
-            "format": ""
         }    ];
 
     static getAttributeTypeMap() {
diff --git a/generated/models/ApiWaveParticipationIdentitySubmissionAllowDuplicates.ts b/generated/models/ApiWaveParticipationIdentitySubmissionAllowDuplicates.ts
deleted file mode 100644
index 41bbb3e91d..0000000000
--- a/generated/models/ApiWaveParticipationIdentitySubmissionAllowDuplicates.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// @ts-nocheck
-/**
- * 6529.io API
- * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { HttpFile } from '../http/http';
-
-export enum ApiWaveParticipationIdentitySubmissionAllowDuplicates {
-    AlwaysAllow = 'ALWAYS_ALLOW',
-    AllowAfterWin = 'ALLOW_AFTER_WIN',
-    NeverAllow = 'NEVER_ALLOW'
-}
diff --git a/generated/models/ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted.ts b/generated/models/ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted.ts
deleted file mode 100644
index 004ae3172e..0000000000
--- a/generated/models/ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// @ts-nocheck
-/**
- * 6529.io API
- * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { HttpFile } from '../http/http';
-
-export enum ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted {
-    OnlyMyself = 'ONLY_MYSELF',
-    OnlyOthers = 'ONLY_OTHERS',
-    Everyone = 'EVERYONE'
-}
diff --git a/generated/models/ApiWaveParticipationSubmissionStrategy.ts b/generated/models/ApiWaveParticipationSubmissionStrategy.ts
deleted file mode 100644
index 8e2ca3d908..0000000000
--- a/generated/models/ApiWaveParticipationSubmissionStrategy.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// @ts-nocheck
-/**
- * 6529.io API
- * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { ApiWaveParticipationSubmissionStrategyIdentityConf } from '../models/ApiWaveParticipationSubmissionStrategyIdentityConf';
-import { ApiWaveParticipationSubmissionStrategyType } from '../models/ApiWaveParticipationSubmissionStrategyType';
-import { HttpFile } from '../http/http';
-
-export class ApiWaveParticipationSubmissionStrategy {
-    'type': ApiWaveParticipationSubmissionStrategyType;
-    'config': ApiWaveParticipationSubmissionStrategyIdentityConf;
-
-    static readonly discriminator: string | undefined = undefined;
-
-    static readonly mapping: {[index: string]: string} | undefined = undefined;
-
-    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
-        {
-            "name": "type",
-            "baseName": "type",
-            "type": "ApiWaveParticipationSubmissionStrategyType",
-            "format": ""
-        },
-        {
-            "name": "config",
-            "baseName": "config",
-            "type": "ApiWaveParticipationSubmissionStrategyIdentityConf",
-            "format": ""
-        }    ];
-
-    static getAttributeTypeMap() {
-        return ApiWaveParticipationSubmissionStrategy.attributeTypeMap;
-    }
-
-    public constructor() {
-    }
-}
-
-
diff --git a/generated/models/ApiWaveParticipationSubmissionStrategyIdentityConf.ts b/generated/models/ApiWaveParticipationSubmissionStrategyIdentityConf.ts
deleted file mode 100644
index 8c86a43b37..0000000000
--- a/generated/models/ApiWaveParticipationSubmissionStrategyIdentityConf.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// @ts-nocheck
-/**
- * 6529.io API
- * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { ApiWaveParticipationIdentitySubmissionAllowDuplicates } from '../models/ApiWaveParticipationIdentitySubmissionAllowDuplicates';
-import { ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted } from '../models/ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted';
-import { HttpFile } from '../http/http';
-
-export class ApiWaveParticipationSubmissionStrategyIdentityConf {
-    'duplicates': ApiWaveParticipationIdentitySubmissionAllowDuplicates;
-    'who_can_be_submitted': ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted;
-
-    static readonly discriminator: string | undefined = undefined;
-
-    static readonly mapping: {[index: string]: string} | undefined = undefined;
-
-    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
-        {
-            "name": "duplicates",
-            "baseName": "duplicates",
-            "type": "ApiWaveParticipationIdentitySubmissionAllowDuplicates",
-            "format": ""
-        },
-        {
-            "name": "who_can_be_submitted",
-            "baseName": "who_can_be_submitted",
-            "type": "ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted",
-            "format": ""
-        }    ];
-
-    static getAttributeTypeMap() {
-        return ApiWaveParticipationSubmissionStrategyIdentityConf.attributeTypeMap;
-    }
-
-    public constructor() {
-    }
-}
-
-
diff --git a/generated/models/ApiWaveParticipationSubmissionStrategyType.ts b/generated/models/ApiWaveParticipationSubmissionStrategyType.ts
deleted file mode 100644
index 7249647f35..0000000000
--- a/generated/models/ApiWaveParticipationSubmissionStrategyType.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// @ts-nocheck
-/**
- * 6529.io API
- * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { HttpFile } from '../http/http';
-
-export enum ApiWaveParticipationSubmissionStrategyType {
-    Identity = 'IDENTITY'
-}
diff --git a/generated/models/ObjectSerializer.ts b/generated/models/ObjectSerializer.ts
index 3370ffc119..fab6c04eef 100644
--- a/generated/models/ObjectSerializer.ts
+++ b/generated/models/ObjectSerializer.ts
@@ -73,7 +73,6 @@ export * from '../models/ApiDropId';
 export * from '../models/ApiDropMedia';
 export * from '../models/ApiDropMentionedUser';
 export * from '../models/ApiDropMetadata';
-export * from '../models/ApiDropMetadataResponse';
 export * from '../models/ApiDropNftLink';
 export * from '../models/ApiDropPart';
 export * from '../models/ApiDropRater';
@@ -183,11 +182,11 @@ export * from '../models/ApiTokenTdh';
 export * from '../models/ApiTokenTdhRank';
 export * from '../models/ApiTransaction';
 export * from '../models/ApiTransactionPage';
+export * from '../models/ApiUndiscoveredDrop';
 export * from '../models/ApiUpcomingMemeSubscriptionStatus';
 export * from '../models/ApiUpdateDropRequest';
 export * from '../models/ApiUpdateProxyActionRequest';
 export * from '../models/ApiUpdateWaveDecisionPause';
-export * from '../models/ApiUpdateWaveParticipationConfig';
 export * from '../models/ApiUpdateWaveRequest';
 export * from '../models/ApiUploadItem';
 export * from '../models/ApiUploadPartOfMultipartUploadRequest';
@@ -221,12 +220,7 @@ export * from '../models/ApiWaveOutcomeSubType';
 export * from '../models/ApiWaveOutcomeType';
 export * from '../models/ApiWaveOutcomesPage';
 export * from '../models/ApiWaveParticipationConfig';
-export * from '../models/ApiWaveParticipationIdentitySubmissionAllowDuplicates';
-export * from '../models/ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted';
 export * from '../models/ApiWaveParticipationRequirement';
-export * from '../models/ApiWaveParticipationSubmissionStrategy';
-export * from '../models/ApiWaveParticipationSubmissionStrategyIdentityConf';
-export * from '../models/ApiWaveParticipationSubmissionStrategyType';
 export * from '../models/ApiWaveRequiredMetadata';
 export * from '../models/ApiWaveScope';
 export * from '../models/ApiWaveSubscriptionActions';
@@ -379,7 +373,6 @@ import { ApiDropId } from '../models/ApiDropId';
 import { ApiDropMedia } from '../models/ApiDropMedia';
 import { ApiDropMentionedUser } from '../models/ApiDropMentionedUser';
 import { ApiDropMetadata } from '../models/ApiDropMetadata';
-import { ApiDropMetadataResponse } from '../models/ApiDropMetadataResponse';
 import { ApiDropNftLink } from '../models/ApiDropNftLink';
 import { ApiDropPart } from '../models/ApiDropPart';
 import { ApiDropRater } from '../models/ApiDropRater';
@@ -489,11 +482,11 @@ import { ApiTokenTdh } from '../models/ApiTokenTdh';
 import { ApiTokenTdhRank } from '../models/ApiTokenTdhRank';
 import { ApiTransaction } from '../models/ApiTransaction';
 import { ApiTransactionPage } from '../models/ApiTransactionPage';
+import { ApiUndiscoveredDrop } from '../models/ApiUndiscoveredDrop';
 import { ApiUpcomingMemeSubscriptionStatus   , ApiUpcomingMemeSubscriptionStatusSourceEnum   } from '../models/ApiUpcomingMemeSubscriptionStatus';
 import { ApiUpdateDropRequest } from '../models/ApiUpdateDropRequest';
 import { ApiUpdateProxyActionRequest } from '../models/ApiUpdateProxyActionRequest';
 import { ApiUpdateWaveDecisionPause } from '../models/ApiUpdateWaveDecisionPause';
-import { ApiUpdateWaveParticipationConfig } from '../models/ApiUpdateWaveParticipationConfig';
 import { ApiUpdateWaveRequest } from '../models/ApiUpdateWaveRequest';
 import { ApiUploadItem } from '../models/ApiUploadItem';
 import { ApiUploadPartOfMultipartUploadRequest } from '../models/ApiUploadPartOfMultipartUploadRequest';
@@ -527,12 +520,7 @@ import { ApiWaveOutcomeSubType } from '../models/ApiWaveOutcomeSubType';
 import { ApiWaveOutcomeType } from '../models/ApiWaveOutcomeType';
 import { ApiWaveOutcomesPage } from '../models/ApiWaveOutcomesPage';
 import { ApiWaveParticipationConfig } from '../models/ApiWaveParticipationConfig';
-import { ApiWaveParticipationIdentitySubmissionAllowDuplicates } from '../models/ApiWaveParticipationIdentitySubmissionAllowDuplicates';
-import { ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted } from '../models/ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted';
 import { ApiWaveParticipationRequirement } from '../models/ApiWaveParticipationRequirement';
-import { ApiWaveParticipationSubmissionStrategy   } from '../models/ApiWaveParticipationSubmissionStrategy';
-import { ApiWaveParticipationSubmissionStrategyIdentityConf   } from '../models/ApiWaveParticipationSubmissionStrategyIdentityConf';
-import { ApiWaveParticipationSubmissionStrategyType } from '../models/ApiWaveParticipationSubmissionStrategyType';
 import { ApiWaveRequiredMetadata   } from '../models/ApiWaveRequiredMetadata';
 import { ApiWaveScope } from '../models/ApiWaveScope';
 import { ApiWaveSubscriptionActions } from '../models/ApiWaveSubscriptionActions';
@@ -650,10 +638,7 @@ let enumsMap: Set<string> = new Set<string>([
     "ApiWaveOutcomeCredit",
     "ApiWaveOutcomeSubType",
     "ApiWaveOutcomeType",
-    "ApiWaveParticipationIdentitySubmissionAllowDuplicates",
-    "ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted",
     "ApiWaveParticipationRequirement",
-    "ApiWaveParticipationSubmissionStrategyType",
     "ApiWaveSubscriptionTargetAction",
     "ApiWaveType",
     "ApiWavesOverviewType",
@@ -739,7 +724,6 @@ let typeMap: {[index: string]: any} = {
     "ApiDropMedia": ApiDropMedia,
     "ApiDropMentionedUser": ApiDropMentionedUser,
     "ApiDropMetadata": ApiDropMetadata,
-    "ApiDropMetadataResponse": ApiDropMetadataResponse,
     "ApiDropNftLink": ApiDropNftLink,
     "ApiDropPart": ApiDropPart,
     "ApiDropRater": ApiDropRater,
@@ -835,11 +819,11 @@ let typeMap: {[index: string]: any} = {
     "ApiTokenTdhRank": ApiTokenTdhRank,
     "ApiTransaction": ApiTransaction,
     "ApiTransactionPage": ApiTransactionPage,
+    "ApiUndiscoveredDrop": ApiUndiscoveredDrop,
     "ApiUpcomingMemeSubscriptionStatus": ApiUpcomingMemeSubscriptionStatus,
     "ApiUpdateDropRequest": ApiUpdateDropRequest,
     "ApiUpdateProxyActionRequest": ApiUpdateProxyActionRequest,
     "ApiUpdateWaveDecisionPause": ApiUpdateWaveDecisionPause,
-    "ApiUpdateWaveParticipationConfig": ApiUpdateWaveParticipationConfig,
     "ApiUpdateWaveRequest": ApiUpdateWaveRequest,
     "ApiUploadItem": ApiUploadItem,
     "ApiUploadPartOfMultipartUploadRequest": ApiUploadPartOfMultipartUploadRequest,
@@ -867,8 +851,6 @@ let typeMap: {[index: string]: any} = {
     "ApiWaveOutcomeDistributionItemsPage": ApiWaveOutcomeDistributionItemsPage,
     "ApiWaveOutcomesPage": ApiWaveOutcomesPage,
     "ApiWaveParticipationConfig": ApiWaveParticipationConfig,
-    "ApiWaveParticipationSubmissionStrategy": ApiWaveParticipationSubmissionStrategy,
-    "ApiWaveParticipationSubmissionStrategyIdentityConf": ApiWaveParticipationSubmissionStrategyIdentityConf,
     "ApiWaveRequiredMetadata": ApiWaveRequiredMetadata,
     "ApiWaveScope": ApiWaveScope,
     "ApiWaveSubscriptionActions": ApiWaveSubscriptionActions,
diff --git a/hooks/memesQuickVote.errors.ts b/hooks/memesQuickVote.errors.ts
deleted file mode 100644
index 490b8ab123..0000000000
--- a/hooks/memesQuickVote.errors.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-"use client";
-
-const getMemesQuickVoteErrorStatus = (error: Error): number | null => {
-  if ("status" in error && typeof error.status === "number") {
-    return error.status;
-  }
-
-  if (!("response" in error)) {
-    return null;
-  }
-
-  const response = error.response;
-
-  if (
-    typeof response !== "object" ||
-    response === null ||
-    !("status" in response) ||
-    typeof response.status !== "number"
-  ) {
-    return null;
-  }
-
-  return response.status;
-};
-
-export const isMemesQuickVoteMissingDropError = (error: unknown): boolean => {
-  if (typeof error === "string") {
-    const normalized = error.toLowerCase();
-    return normalized.includes("not found") || normalized.includes("404");
-  }
-
-  if (!(error instanceof Error)) {
-    return false;
-  }
-
-  if (getMemesQuickVoteErrorStatus(error) === 404) {
-    return true;
-  }
-
-  const normalizedMessage = error.message.toLowerCase();
-  return (
-    normalizedMessage.includes("not found") || normalizedMessage.includes("404")
-  );
-};
diff --git a/hooks/memesQuickVote.helpers.ts b/hooks/memesQuickVote.helpers.ts
index 3789814cfb..7f49ee4f1d 100644
--- a/hooks/memesQuickVote.helpers.ts
+++ b/hooks/memesQuickVote.helpers.ts
@@ -1,13 +1,3 @@
-import type { ApiDrop } from "@/generated/models/ApiDrop";
-import type { ApiDropWithoutWave } from "@/generated/models/ApiDropWithoutWave";
-import { ApiDropType } from "@/generated/models/ApiDropType";
-import type { ApiWaveMin } from "@/generated/models/ApiWaveMin";
-import { WAVE_VOTING_LABELS } from "@/helpers/waves/waves.constants";
-import { Time } from "@/helpers/time";
-
-export const MEMES_QUICK_VOTE_DISCOVERY_PAGE_SIZE = 20 as const;
-export const MEMES_QUICK_VOTE_REPLENISH_THRESHOLD = 5 as const;
-export const MEMES_QUICK_VOTE_SUMMARY_PAGE_SIZE = 1 as const;
 const QUICK_VOTE_DEFAULT_PERCENTAGE = 0.01;
 const MAX_QUICK_VOTE_AMOUNTS = 5;
 
@@ -17,31 +7,15 @@ export type MemesQuickVoteStats = {
   readonly votingLabel: string | null;
 };
 
-export const sanitizeStoredDropIds = (value: unknown): string[] => {
-  if (!Array.isArray(value)) {
-    return [];
-  }
-
-  const seen = new Set<string>();
-  const ids: string[] = [];
-
-  for (const entry of value) {
-    if (typeof entry !== "string") {
-      continue;
-    }
-
-    const trimmed = entry.trim();
-
-    if (trimmed.length === 0 || seen.has(trimmed)) {
-      continue;
+type QuickVoteableDropLike =
+  | {
+      readonly context_profile_context?: {
+        readonly max_rating?: number | null;
+        readonly rating?: number | null;
+      } | null;
     }
-
-    seen.add(trimmed);
-    ids.push(trimmed);
-  }
-
-  return ids;
-};
+  | null
+  | undefined;
 
 export const sanitizeStoredAmounts = (value: unknown): number[] => {
   if (!Array.isArray(value)) {
@@ -68,105 +42,6 @@ export const sanitizeStoredAmounts = (value: unknown): number[] => {
 
   return amounts.slice(-MAX_QUICK_VOTE_AMOUNTS);
 };
-
-export const buildMemesQuickVoteApiDrop = (
-  drop: ApiDropWithoutWave,
-  wave: ApiWaveMin
-): ApiDrop => ({
-  ...drop,
-  wave,
-});
-
-export const deriveMemesQuickVoteStatsFromDrop = ({
-  count,
-  drop,
-}: {
-  readonly count: number;
-  readonly drop: ApiDrop | null;
-}): MemesQuickVoteStats => {
-  if (count <= 0 || !drop) {
-    return {
-      uncastPower: null,
-      unratedCount: 0,
-      votingLabel: null,
-    };
-  }
-
-  const uncastPower = drop.context_profile_context?.max_rating ?? null;
-
-  return {
-    uncastPower:
-      typeof uncastPower === "number" && uncastPower > 0 ? uncastPower : null,
-    unratedCount: count,
-    votingLabel: WAVE_VOTING_LABELS[drop.wave.voting_credit_type],
-  };
-};
-
-export const isMemesQuickVoteDiscoverableDrop = ({
-  drop,
-  now = Time.currentMillis(),
-  waveId,
-}: {
-  readonly drop: ApiDrop | null | undefined;
-  readonly now?: number | undefined;
-  readonly waveId?: string | null | undefined;
-}): boolean => {
-  if (drop?.drop_type !== ApiDropType.Participatory) {
-    return false;
-  }
-
-  if (waveId && drop.wave.id !== waveId) {
-    return false;
-  }
-
-  const profileContext = drop.context_profile_context;
-
-  if (
-    profileContext?.rating !== 0 ||
-    typeof profileContext.max_rating !== "number"
-  ) {
-    return false;
-  }
-
-  if (
-    !drop.wave.authenticated_user_eligible_to_vote ||
-    drop.id.startsWith("temp-")
-  ) {
-    return false;
-  }
-
-  const votingPeriodStart = drop.wave.voting_period_start;
-
-  if (votingPeriodStart !== null && now < votingPeriodStart) {
-    return false;
-  }
-
-  const votingPeriodEnd = drop.wave.voting_period_end;
-
-  return votingPeriodEnd === null || now <= votingPeriodEnd;
-};
-
-export const getMemesQuickVoteRemainingCount = ({
-  count,
-  floor = 0,
-  hiddenCount = 0,
-  optimisticVoteCount = 0,
-}: {
-  readonly count: number | null;
-  readonly floor?: number | undefined;
-  readonly hiddenCount?: number | undefined;
-  readonly optimisticVoteCount?: number | undefined;
-}): number =>
-  Math.max(
-    floor,
-    Math.max(0, (count ?? 0) - optimisticVoteCount - hiddenCount)
-  );
-
-export const appendSkippedDropId = (
-  ids: readonly string[],
-  dropId: string
-): string[] => [...ids.filter((value) => value !== dropId), dropId];
-
 export const addRecentQuickVoteAmount = (
   amounts: readonly number[],
   amount: number
@@ -203,3 +78,15 @@ export const normalizeQuickVoteAmount = (
 
   return Math.max(1, Math.min(Math.round(parsedValue), Math.floor(maxRating)));
 };
+
+export const isMemesQuickVoteVoteableDrop = (
+  drop: QuickVoteableDropLike
+): boolean => {
+  const profileContext = drop?.context_profile_context;
+
+  return (
+    profileContext?.rating === 0 &&
+    typeof profileContext.max_rating === "number" &&
+    profileContext.max_rating > 0
+  );
+};
diff --git a/hooks/memesQuickVote.query.ts b/hooks/memesQuickVote.query.ts
index 72d67a4e70..89f876b640 100644
--- a/hooks/memesQuickVote.query.ts
+++ b/hooks/memesQuickVote.query.ts
@@ -1,182 +1,50 @@
-import { QueryKey } from "@/components/react-query-wrapper/ReactQueryWrapper";
-import type { ApiDrop } from "@/generated/models/ApiDrop";
-import type { ApiDropsLeaderboardPage } from "@/generated/models/ApiDropsLeaderboardPage";
-import {
-  buildMemesQuickVoteApiDrop,
-  MEMES_QUICK_VOTE_DISCOVERY_PAGE_SIZE,
-  MEMES_QUICK_VOTE_REPLENISH_THRESHOLD,
-  MEMES_QUICK_VOTE_SUMMARY_PAGE_SIZE,
-} from "@/hooks/memesQuickVote.helpers";
-import {
-  deriveMemesQuickVoteDiscoverySnapshot,
-  shouldFetchMemesQuickVotePage,
-  type MemesQuickVoteDiscoveryPage,
-  type MemesQuickVoteDiscoveryState,
-} from "@/hooks/memesQuickVote.queue.helpers";
+import type { ApiUndiscoveredDrop } from "@/generated/models/ApiUndiscoveredDrop";
 import { commonApiFetch } from "@/services/api/common-api";
 
-const MEMES_QUICK_VOTE_DISCOVERY_SORT = "CREATED_AT" as const;
-const MEMES_QUICK_VOTE_DISCOVERY_SORT_DIRECTION = "DESC" as const;
+export const MEMES_QUICK_VOTE_UNDISCOVERED_DROP_QUERY_KEY =
+  "MEMES_QUICK_VOTE_UNDISCOVERED_DROP" as const;
+export const MEMES_QUICK_VOTE_LOOKAHEAD_COUNT = 4 as const;
 
-export type MemesQuickVoteDiscoveryQueryData = {
-  readonly pages: readonly MemesQuickVoteDiscoveryPage[];
-};
-
-export const getMemesQuickVoteDropQueryKey = ({
-  contextProfile,
-  dropId,
-  proxyId,
-}: {
-  readonly contextProfile: string | null | undefined;
-  readonly dropId: string;
-  readonly proxyId: string | null | undefined;
-}) =>
-  [
-    QueryKey.DROP,
-    {
-      context: "memes-quick-vote",
-      context_profile: contextProfile ?? null,
-      drop_id: dropId,
-      proxyId: proxyId ?? null,
-    },
-  ] as const;
-
-export const fetchMemesQuickVoteDrop = async (dropId: string) =>
-  await commonApiFetch<ApiDrop>({
-    endpoint: `drops/${dropId}`,
-  });
-
-export const getMemesQuickVoteSummaryQueryKey = ({
+export const getMemesQuickVoteUndiscoveredDropQueryKey = ({
   contextProfile,
   proxyId,
+  sessionId,
+  skip,
   waveId,
 }: {
   readonly contextProfile: string | null | undefined;
   readonly proxyId: string | null | undefined;
-  readonly waveId: string | null;
-}) =>
-  [
-    QueryKey.DROPS_LEADERBOARD,
-    {
-      context: "memes-quick-vote-summary",
-      context_profile: contextProfile,
-      page: 1,
-      page_size: MEMES_QUICK_VOTE_SUMMARY_PAGE_SIZE,
-      proxyId,
-      sort: MEMES_QUICK_VOTE_DISCOVERY_SORT,
-      sort_direction: MEMES_QUICK_VOTE_DISCOVERY_SORT_DIRECTION,
-      unvoted_by_me: true,
-      waveId,
-    },
-  ] as const;
-
-export const fetchMemesQuickVoteSummary = async (waveId: string | null) => {
-  if (waveId === null) {
-    throw new Error("Memes quick vote summary requires a wave id");
-  }
-
-  return await commonApiFetch<ApiDropsLeaderboardPage>({
-    endpoint: `waves/${waveId}/leaderboard`,
-    params: {
-      page: "1",
-      page_size: `${MEMES_QUICK_VOTE_SUMMARY_PAGE_SIZE}`,
-      sort: MEMES_QUICK_VOTE_DISCOVERY_SORT,
-      sort_direction: MEMES_QUICK_VOTE_DISCOVERY_SORT_DIRECTION,
-      unvoted_by_me: "true",
-    },
-  });
-};
-
-export const getMemesQuickVoteDiscoveryStateKey = ({
-  contextProfile,
-  enabled,
-  memesWaveId,
-  sessionId,
-}: {
-  readonly contextProfile: string | null | undefined;
-  readonly enabled: boolean;
-  readonly memesWaveId: string | null | undefined;
   readonly sessionId: number;
-}): string =>
-  `${sessionId}:${memesWaveId ?? ""}:${contextProfile ?? ""}:${enabled ? "1" : "0"}`;
-
-export const getMemesQuickVoteDiscoveryQueryKey = ({
-  discoveryStateKey,
-  fetchVersion,
-  waveId,
-}: {
-  readonly discoveryStateKey: string;
-  readonly fetchVersion: number;
+  readonly skip: number;
   readonly waveId: string | null;
 }) =>
   [
-    QueryKey.DROPS_LEADERBOARD,
+    MEMES_QUICK_VOTE_UNDISCOVERED_DROP_QUERY_KEY,
     {
-      context: "memes-quick-vote-discovery",
-      fetchVersion,
-      identity: discoveryStateKey,
-      page_size: MEMES_QUICK_VOTE_DISCOVERY_PAGE_SIZE,
-      sort: MEMES_QUICK_VOTE_DISCOVERY_SORT,
-      sort_direction: MEMES_QUICK_VOTE_DISCOVERY_SORT_DIRECTION,
-      unvoted_by_me: true,
+      context_profile: contextProfile ?? null,
+      proxyId: proxyId ?? null,
+      sessionId,
+      skip,
       waveId,
     },
   ] as const;
 
-export const fetchMemesQuickVoteDiscoveryBatch = async ({
-  discoveryState,
-  skippedDropIds,
+export const fetchMemesQuickVoteUndiscoveredDrop = async ({
+  skip,
   waveId,
+  signal,
 }: {
-  readonly discoveryState: MemesQuickVoteDiscoveryState;
-  readonly skippedDropIds: readonly string[];
+  readonly skip: number;
   readonly waveId: string | null;
-}): Promise<MemesQuickVoteDiscoveryQueryData> => {
+  readonly signal?: AbortSignal | undefined;
+}): Promise<ApiUndiscoveredDrop> => {
   if (waveId === null) {
-    throw new Error("Memes quick vote discovery requires a wave id");
-  }
-
-  const pages: MemesQuickVoteDiscoveryPage[] = [];
-  let nextPageToFetch: number | null = 1;
-
-  while (nextPageToFetch !== null) {
-    const page = await commonApiFetch<ApiDropsLeaderboardPage>({
-      endpoint: `waves/${waveId}/leaderboard`,
-      params: {
-        page: `${nextPageToFetch}`,
-        page_size: `${MEMES_QUICK_VOTE_DISCOVERY_PAGE_SIZE}`,
-        sort: MEMES_QUICK_VOTE_DISCOVERY_SORT,
-        sort_direction: MEMES_QUICK_VOTE_DISCOVERY_SORT_DIRECTION,
-        unvoted_by_me: "true",
-      },
-    });
-
-    pages.push({
-      drops: page.drops.map((drop) =>
-        buildMemesQuickVoteApiDrop(drop, page.wave)
-      ),
-      nextPage: page.next ? page.page + 1 : null,
-      pageCount: page.count,
-    });
-
-    const snapshot = deriveMemesQuickVoteDiscoverySnapshot({
-      enabled: true,
-      pages,
-      skippedDropIds,
-      state: discoveryState,
-    });
-
-    if (
-      !shouldFetchMemesQuickVotePage({
-        replenishThreshold: MEMES_QUICK_VOTE_REPLENISH_THRESHOLD,
-        state: snapshot,
-      })
-    ) {
-      break;
-    }
-
-    nextPageToFetch = snapshot.nextPage;
+    throw new Error("Memes quick vote undiscovered drop requires a wave id");
   }
 
-  return { pages };
+  return await commonApiFetch<ApiUndiscoveredDrop>({
+    endpoint: `waves/${waveId}/undiscovered-drop`,
+    params: skip > 0 ? { skip: `${skip}` } : undefined,
+    signal,
+  });
 };
diff --git a/hooks/memesQuickVote.queue.helpers.ts b/hooks/memesQuickVote.queue.helpers.ts
deleted file mode 100644
index 60fb712925..0000000000
--- a/hooks/memesQuickVote.queue.helpers.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-import type { ApiDrop } from "@/generated/models/ApiDrop";
-
-export type MemesQuickVoteDiscoveryState = {
-  readonly deferredIds: string[];
-  readonly removedIds: string[];
-};
-
-export type MemesQuickVoteDiscoveryPage = {
-  readonly drops: readonly ApiDrop[];
-  readonly nextPage: number | null;
-  readonly pageCount: number;
-};
-
-type MemesQuickVoteDiscoverySnapshot = {
-  readonly activeIds: string[];
-  readonly deferredIds: string[];
-  readonly discoveredDropsById: Record<string, ApiDrop>;
-  readonly nextPage: number | null;
-  readonly serverCount: number | null;
-};
-
-export const createInitialMemesQuickVoteDiscoveryState = ({
-  enabled: _enabled,
-}: {
-  readonly enabled?: boolean | undefined;
-} = {}): MemesQuickVoteDiscoveryState => ({
-  deferredIds: [],
-  removedIds: [],
-});
-
-const hasId = (ids: readonly string[], targetId: string): boolean =>
-  ids.includes(targetId);
-
-export const deriveMemesQuickVoteDiscoverySnapshot = ({
-  enabled,
-  pages,
-  skippedDropIds,
-  state,
-}: {
-  readonly enabled: boolean;
-  readonly pages: readonly MemesQuickVoteDiscoveryPage[];
-  readonly skippedDropIds: readonly string[];
-  readonly state: MemesQuickVoteDiscoveryState;
-}): MemesQuickVoteDiscoverySnapshot => {
-  if (pages.length === 0) {
-    return {
-      activeIds: [],
-      deferredIds: [],
-      discoveredDropsById: {},
-      nextPage: enabled ? 1 : null,
-      serverCount: null,
-    };
-  }
-
-  const discoveredDropsById: Record<string, ApiDrop> = {};
-  const discoveredIds: string[] = [];
-
-  for (const page of pages) {
-    for (const drop of page.drops) {
-      if (!discoveredDropsById[drop.id]) {
-        discoveredIds.push(drop.id);
-      }
-
-      discoveredDropsById[drop.id] = drop;
-    }
-  }
-
-  const removedIds = new Set(state.removedIds);
-  const skippedDropIdSet = new Set(skippedDropIds);
-  const activeIds = discoveredIds.filter(
-    (dropId) => !removedIds.has(dropId) && !skippedDropIdSet.has(dropId)
-  );
-  const lastPage = pages[pages.length - 1];
-
-  return {
-    activeIds,
-    deferredIds: [],
-    discoveredDropsById,
-    nextPage: lastPage?.nextPage ?? null,
-    serverCount: lastPage?.pageCount ?? null,
-  };
-};
-
-export const removeMemesQuickVoteDropId = ({
-  dropId,
-  state,
-}: {
-  readonly dropId: string;
-  readonly state: MemesQuickVoteDiscoveryState;
-}): MemesQuickVoteDiscoveryState => {
-  if (hasId(state.removedIds, dropId)) {
-    return state;
-  }
-
-  return {
-    deferredIds: [],
-    removedIds: [...state.removedIds, dropId],
-  };
-};
-
-export const deferMemesQuickVoteDropId = ({
-  dropId,
-  state,
-}: {
-  readonly dropId: string;
-  readonly state: MemesQuickVoteDiscoveryState;
-}): MemesQuickVoteDiscoveryState =>
-  removeMemesQuickVoteDropId({
-    dropId,
-    state,
-  });
-
-export const getMemesQuickVoteActiveCandidateId = (
-  state: MemesQuickVoteDiscoverySnapshot
-): string | null => {
-  return state.activeIds[0] ?? null;
-};
-
-export const getMemesQuickVoteNextCandidateId = (
-  state: MemesQuickVoteDiscoverySnapshot
-): string | null => state.activeIds[1] ?? null;
-
-export const getMemesQuickVoteDiscoveredQueue = (
-  state: MemesQuickVoteDiscoverySnapshot
-): ApiDrop[] =>
-  state.activeIds.flatMap((dropId) => {
-    const drop = state.discoveredDropsById[dropId];
-    return drop ? [drop] : [];
-  });
-
-export const shouldFetchMemesQuickVotePage = ({
-  replenishThreshold,
-  state,
-}: {
-  readonly replenishThreshold: number;
-  readonly state: MemesQuickVoteDiscoverySnapshot;
-}): boolean =>
-  state.nextPage !== null && state.activeIds.length <= replenishThreshold;
-
-export const isMemesQuickVoteExhausted = (
-  state: MemesQuickVoteDiscoverySnapshot
-): boolean => state.nextPage === null && state.activeIds.length === 0;
diff --git a/hooks/memesQuickVote.queue.state.ts b/hooks/memesQuickVote.queue.state.ts
new file mode 100644
index 0000000000..37fd0e94f2
--- /dev/null
+++ b/hooks/memesQuickVote.queue.state.ts
@@ -0,0 +1,292 @@
+import type { ApiDrop } from "@/generated/models/ApiDrop";
+import type { ExtendedDrop } from "@/helpers/waves/drop.helpers";
+
+export type KeyedOptimisticRemainingPowerState = {
+  readonly key: string;
+  readonly value: number | null;
+};
+
+export type MemesQuickVoteSessionState = {
+  readonly currentDrop: ApiDrop | null;
+  readonly hasDiscoveryError: boolean;
+  readonly isExhausted: boolean;
+  readonly isLoading: boolean;
+  readonly lookaheadDrops: readonly ApiDrop[];
+  readonly recentlyHandledDropIds: readonly string[];
+  readonly totalCount: number;
+};
+
+export const createInitialOptimisticRemainingPowerState = (
+  key: string
+): KeyedOptimisticRemainingPowerState => ({
+  key,
+  value: null,
+});
+
+export const getCurrentOptimisticRemainingPowerState = ({
+  key,
+  state,
+}: {
+  readonly key: string;
+  readonly state: KeyedOptimisticRemainingPowerState;
+}): KeyedOptimisticRemainingPowerState =>
+  state.key === key ? state : createInitialOptimisticRemainingPowerState(key);
+
+export const createInitialSessionState = (): MemesQuickVoteSessionState => ({
+  currentDrop: null,
+  hasDiscoveryError: false,
+  isExhausted: false,
+  isLoading: false,
+  lookaheadDrops: [],
+  recentlyHandledDropIds: [],
+  totalCount: 0,
+});
+
+export const getUniqueDrops = (drops: readonly ApiDrop[]): ApiDrop[] => {
+  const seen = new Set<string>();
+  const uniqueDrops: ApiDrop[] = [];
+
+  for (const drop of drops) {
+    if (seen.has(drop.id)) {
+      continue;
+    }
+
+    seen.add(drop.id);
+    uniqueDrops.push(drop);
+  }
+
+  return uniqueDrops;
+};
+
+const getDisplayRemainingCount = ({
+  hiddenDropIds,
+  rawTotalCount,
+}: {
+  readonly hiddenDropIds: ReadonlySet<string>;
+  readonly rawTotalCount: number;
+}): number => Math.max(0, rawTotalCount - hiddenDropIds.size);
+
+export const applyFetchedWindowState = ({
+  current,
+  fetchedDrops,
+  pendingDropIds,
+  primaryDrop,
+  rawTotalCount,
+}: {
+  readonly current: MemesQuickVoteSessionState;
+  readonly fetchedDrops: readonly ApiDrop[];
+  readonly pendingDropIds: readonly string[];
+  readonly primaryDrop: ApiDrop | null;
+  readonly rawTotalCount: number;
+}): MemesQuickVoteSessionState => {
+  const returnedDropIds = new Set(fetchedDrops.map((drop) => drop.id));
+  const resurfacedHandledDropIds = current.recentlyHandledDropIds.filter(
+    (dropId) => returnedDropIds.has(dropId)
+  );
+  const safeFetchedDropsWithoutHandled = fetchedDrops.filter(
+    (drop) =>
+      !pendingDropIds.includes(drop.id) &&
+      !resurfacedHandledDropIds.includes(drop.id)
+  );
+  const recentlyHandledDropIds =
+    rawTotalCount > 0 && safeFetchedDropsWithoutHandled.length === 0
+      ? []
+      : resurfacedHandledDropIds;
+  const hiddenDropIds = new Set([...recentlyHandledDropIds, ...pendingDropIds]);
+  let currentDrop = current.currentDrop;
+
+  if (currentDrop) {
+    const refreshedCurrentDrop = fetchedDrops.find(
+      (drop) => drop.id === currentDrop?.id
+    );
+
+    if (refreshedCurrentDrop) {
+      currentDrop = refreshedCurrentDrop;
+    }
+  }
+
+  if (currentDrop && hiddenDropIds.has(currentDrop.id)) {
+    currentDrop = null;
+  }
+
+  const safeFetchedDrops = fetchedDrops.filter(
+    (drop) => !hiddenDropIds.has(drop.id)
+  );
+  currentDrop ??= safeFetchedDrops[0] ?? null;
+
+  const lookaheadDrops = safeFetchedDrops.filter(
+    (drop) => drop.id !== currentDrop?.id
+  );
+  const totalCount = getDisplayRemainingCount({
+    hiddenDropIds,
+    rawTotalCount,
+  });
+  const isExhausted =
+    currentDrop === null &&
+    lookaheadDrops.length === 0 &&
+    hiddenDropIds.size === 0 &&
+    primaryDrop === null &&
+    rawTotalCount === 0;
+
+  return {
+    currentDrop,
+    hasDiscoveryError: false,
+    isExhausted,
+    isLoading: currentDrop === null && !isExhausted,
+    lookaheadDrops,
+    recentlyHandledDropIds,
+    totalCount,
+  };
+};
+
+export const reduceOptimisticRemainingPower = ({
+  amount,
+  current,
+  maxRating,
+}: {
+  readonly amount: number;
+  readonly current: KeyedOptimisticRemainingPowerState;
+  readonly maxRating: number;
+}): KeyedOptimisticRemainingPowerState => ({
+  ...current,
+  value: Math.max(0, (current.value ?? maxRating) - amount),
+});
+
+export const reconcileOptimisticRemainingPower = ({
+  current,
+  nextRemainingPower,
+}: {
+  readonly current: KeyedOptimisticRemainingPowerState;
+  readonly nextRemainingPower: number;
+}): KeyedOptimisticRemainingPowerState => ({
+  ...current,
+  value:
+    current.value === null
+      ? nextRemainingPower
+      : Math.min(current.value, nextRemainingPower),
+});
+
+export const restoreOptimisticRemainingPower = ({
+  amount,
+  current,
+  maxRating,
+}: {
+  readonly amount: number;
+  readonly current: KeyedOptimisticRemainingPowerState;
+  readonly maxRating: number;
+}): KeyedOptimisticRemainingPowerState => ({
+  ...current,
+  value:
+    current.value === null
+      ? maxRating
+      : Math.min(maxRating, current.value + amount),
+});
+
+export const applyOptimisticAdvanceState = ({
+  current,
+  dropId,
+  pendingDropIds,
+}: {
+  readonly current: MemesQuickVoteSessionState;
+  readonly dropId: string;
+  readonly pendingDropIds: readonly string[];
+}): MemesQuickVoteSessionState => {
+  const recentlyHandledDropIds = current.recentlyHandledDropIds.includes(dropId)
+    ? current.recentlyHandledDropIds
+    : [...current.recentlyHandledDropIds, dropId];
+  const hiddenDropIds = new Set([
+    ...recentlyHandledDropIds,
+    ...pendingDropIds,
+    dropId,
+  ]);
+  const nextLookaheadDrops = current.lookaheadDrops.filter(
+    (candidate) => !hiddenDropIds.has(candidate.id)
+  );
+  const currentDrop = nextLookaheadDrops[0] ?? null;
+
+  return {
+    currentDrop,
+    hasDiscoveryError: false,
+    isExhausted: false,
+    isLoading: currentDrop === null,
+    lookaheadDrops: nextLookaheadDrops.slice(1),
+    recentlyHandledDropIds,
+    totalCount: Math.max(0, current.totalCount - 1),
+  };
+};
+
+export const applyFailedDropRestoreState = ({
+  current,
+  failedDrop,
+}: {
+  readonly current: MemesQuickVoteSessionState;
+  readonly failedDrop: ApiDrop;
+}): MemesQuickVoteSessionState => {
+  const wasHandled = current.recentlyHandledDropIds.includes(failedDrop.id);
+  const recentlyHandledDropIds = current.recentlyHandledDropIds.filter(
+    (dropId) => dropId !== failedDrop.id
+  );
+
+  return {
+    ...current,
+    currentDrop: current.currentDrop ?? failedDrop,
+    hasDiscoveryError: false,
+    isExhausted: false,
+    isLoading: false,
+    recentlyHandledDropIds,
+    totalCount: wasHandled ? current.totalCount + 1 : current.totalCount,
+  };
+};
+
+export const getEffectiveOptimisticRemainingPower = ({
+  activeApiDrop,
+  state,
+}: {
+  readonly activeApiDrop: ApiDrop | null;
+  readonly state: KeyedOptimisticRemainingPowerState;
+}): number | null => {
+  if (state.value === null) {
+    return null;
+  }
+
+  const activeMaxRating = activeApiDrop?.context_profile_context?.max_rating;
+
+  if (typeof activeMaxRating === "number" && activeMaxRating <= state.value) {
+    return null;
+  }
+
+  return state.value;
+};
+
+export const clampDropMaxRating = (
+  drop: ExtendedDrop,
+  optimisticRemainingPower: number | null
+): ExtendedDrop => {
+  const profileContext = drop.context_profile_context;
+  const maxRating = profileContext?.max_rating;
+
+  if (
+    optimisticRemainingPower === null ||
+    profileContext?.rating !== 0 ||
+    typeof maxRating !== "number"
+  ) {
+    return drop;
+  }
+
+  const nextMaxRating = Math.max(
+    0,
+    Math.min(maxRating, optimisticRemainingPower)
+  );
+
+  if (nextMaxRating === maxRating) {
+    return drop;
+  }
+
+  return {
+    ...drop,
+    context_profile_context: {
+      ...profileContext,
+      max_rating: nextMaxRating,
+    },
+  };
+};
diff --git a/hooks/memesQuickVote.storageStore.ts b/hooks/memesQuickVote.storageStore.ts
index 93d2a71267..1ba96721b0 100644
--- a/hooks/memesQuickVote.storageStore.ts
+++ b/hooks/memesQuickVote.storageStore.ts
@@ -190,20 +190,3 @@ export const useStoredNumberArray = (
   key: string | null,
   sanitize: ArraySanitizer<number>
 ): number[] => useStoredArray(key, sanitize);
-
-export const readStoredStringArray = (
-  key: string | null,
-  sanitize: ArraySanitizer<string>
-): string[] => readStoredArray(key, sanitize);
-
-export const writeStoredStringArray = (
-  key: string | null,
-  values: readonly string[]
-): void => {
-  writeStoredArray(key, values);
-};
-
-export const useStoredStringArray = (
-  key: string | null,
-  sanitize: ArraySanitizer<string>
-): string[] => useStoredArray(key, sanitize);
diff --git a/hooks/useMemesQuickVoteActiveDrop.ts b/hooks/useMemesQuickVoteActiveDrop.ts
deleted file mode 100644
index 0bc518aa38..0000000000
--- a/hooks/useMemesQuickVoteActiveDrop.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-"use client";
-
-import { QueryKey } from "@/components/react-query-wrapper/ReactQueryWrapper";
-import { getDefaultQueryRetry } from "@/components/react-query-wrapper/utils/query-utils";
-import type { ApiDrop } from "@/generated/models/ApiDrop";
-import { convertApiDropToExtendedDrop } from "@/helpers/waves/drop.helpers";
-import {
-  fetchMemesQuickVoteDrop,
-  getMemesQuickVoteDropQueryKey,
-} from "@/hooks/memesQuickVote.query";
-import { useMemesQuickVoteContext } from "@/hooks/useMemesQuickVoteContext";
-import { isMemesQuickVoteDiscoverableDrop } from "@/hooks/memesQuickVote.helpers";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useEffect, useMemo } from "react";
-
-export const useMemesQuickVoteActiveDrop = ({
-  activeCandidateId,
-  discoveredDropsById,
-  enabled,
-  nextCandidateId,
-  onInvalidatedDrop,
-}: {
-  readonly activeCandidateId: string | null;
-  readonly discoveredDropsById: Record<string, ApiDrop>;
-  readonly enabled: boolean;
-  readonly nextCandidateId: string | null;
-  readonly onInvalidatedDrop: (dropId: string) => void;
-}) => {
-  const queryClient = useQueryClient();
-  const { contextProfile, proxyId } = useMemesQuickVoteContext();
-  const activeInitialDrop = activeCandidateId
-    ? discoveredDropsById[activeCandidateId]
-    : undefined;
-
-  const activeQuery = useQuery({
-    queryKey: activeCandidateId
-      ? getMemesQuickVoteDropQueryKey({
-          contextProfile,
-          dropId: activeCandidateId,
-          proxyId,
-        })
-      : [QueryKey.DROP, { context: "memes-quick-vote", drop_id: null }],
-    queryFn: () => fetchMemesQuickVoteDrop(activeCandidateId!),
-    enabled: enabled && !!activeCandidateId,
-    initialData: activeInitialDrop,
-    refetchOnReconnect: false,
-    refetchOnWindowFocus: false,
-    staleTime: 0,
-    ...getDefaultQueryRetry(),
-  });
-
-  const isUsingInitialData =
-    !!activeInitialDrop &&
-    activeQuery.data === activeInitialDrop &&
-    !activeQuery.isFetchedAfterMount;
-  const hasFreshData = !!activeQuery.data && !isUsingInitialData;
-
-  useEffect(() => {
-    if (!enabled || !nextCandidateId) {
-      return;
-    }
-
-    void queryClient.prefetchQuery({
-      queryKey: getMemesQuickVoteDropQueryKey({
-        contextProfile,
-        dropId: nextCandidateId,
-        proxyId,
-      }),
-      queryFn: () => fetchMemesQuickVoteDrop(nextCandidateId),
-      staleTime: 0,
-      ...getDefaultQueryRetry(),
-    });
-  }, [contextProfile, enabled, nextCandidateId, proxyId, queryClient]);
-
-  useEffect(() => {
-    if (!activeCandidateId || !activeQuery.data || !hasFreshData) {
-      return;
-    }
-
-    if (isMemesQuickVoteDiscoverableDrop({ drop: activeQuery.data })) {
-      return;
-    }
-
-    onInvalidatedDrop(activeCandidateId);
-  }, [activeCandidateId, activeQuery.data, hasFreshData, onInvalidatedDrop]);
-
-  useEffect(() => {
-    if (!activeCandidateId || activeQuery.isFetching || !activeQuery.error) {
-      return;
-    }
-
-    onInvalidatedDrop(activeCandidateId);
-  }, [
-    activeCandidateId,
-    activeQuery.error,
-    activeQuery.isFetching,
-    onInvalidatedDrop,
-  ]);
-
-  const activeDrop = useMemo(() => {
-    if (!activeQuery.data) {
-      return null;
-    }
-
-    return convertApiDropToExtendedDrop(activeQuery.data);
-  }, [activeQuery.data]);
-
-  return {
-    activeDrop,
-    hasFreshData,
-    isLoading:
-      !!activeCandidateId &&
-      !activeQuery.data &&
-      (activeQuery.isLoading || activeQuery.isFetching),
-  };
-};
diff --git a/hooks/useMemesQuickVoteDialogController.ts b/hooks/useMemesQuickVoteDialogController.ts
index 8c9edd296c..9d7251e09a 100644
--- a/hooks/useMemesQuickVoteDialogController.ts
+++ b/hooks/useMemesQuickVoteDialogController.ts
@@ -1,10 +1,33 @@
 "use client";
 
-import { usePrefetchMemesQuickVote } from "@/hooks/usePrefetchMemesQuickVote";
+import {
+  useMemesQuickVoteQueue,
+  type UseMemesQuickVoteQueueResult,
+} from "@/hooks/useMemesQuickVoteQueue";
 import { useCallback, useRef, useState } from "react";
 
+export type MemesQuickVoteDialogState = Pick<
+  UseMemesQuickVoteQueueResult,
+  | "activeDrop"
+  | "hasDiscoveryError"
+  | "isExhausted"
+  | "latestUsedAmount"
+  | "recentAmounts"
+  | "remainingCount"
+  | "retryDiscovery"
+  | "submitVote"
+  | "skipDrop"
+  | "uncastPower"
+  | "votingLabel"
+> & {
+  readonly isOpen: boolean;
+  readonly onClose: () => void;
+  readonly sessionId: number;
+};
+
 type UseMemesQuickVoteDialogControllerResult = {
   readonly closeQuickVote: () => void;
+  readonly dialogState: MemesQuickVoteDialogState;
   readonly isQuickVoteOpen: boolean;
   readonly openQuickVote: () => void;
   readonly prefetchQuickVote: () => void;
@@ -13,12 +36,15 @@ type UseMemesQuickVoteDialogControllerResult = {
 
 export const useMemesQuickVoteDialogController =
   (): UseMemesQuickVoteDialogControllerResult => {
-    const prefetchMemesQuickVote = usePrefetchMemesQuickVote();
     const [isQuickVoteOpen, setIsQuickVoteOpen] = useState(false);
     const [quickVoteSessionId, setQuickVoteSessionId] = useState(0);
     const lastIssuedSessionIdRef = useRef(0);
     const reservedSessionIdRef = useRef<number | null>(null);
-    const prefetchedSessionIdsRef = useRef(new Set<number>());
+    const quickVoteQueue = useMemesQuickVoteQueue({
+      enabled: quickVoteSessionId > 0,
+      sessionId: quickVoteSessionId,
+    });
+    const { retryDiscovery } = quickVoteQueue;
 
     const reserveSessionId = useCallback(() => {
       if (reservedSessionIdRef.current !== null) {
@@ -31,17 +57,24 @@ export const useMemesQuickVoteDialogController =
     }, []);
 
     const prefetchQuickVote = useCallback(() => {
-      const sessionId = reserveSessionId();
-
-      if (prefetchedSessionIdsRef.current.has(sessionId)) {
+      if (quickVoteSessionId > 0) {
+        retryDiscovery();
         return;
       }
 
-      prefetchedSessionIdsRef.current.add(sessionId);
-      void prefetchMemesQuickVote(sessionId);
-    }, [prefetchMemesQuickVote, reserveSessionId]);
+      const sessionId = reserveSessionId();
+      lastIssuedSessionIdRef.current = sessionId;
+      reservedSessionIdRef.current = null;
+      setQuickVoteSessionId(sessionId);
+    }, [quickVoteSessionId, reserveSessionId, retryDiscovery]);
 
     const openQuickVote = useCallback(() => {
+      if (quickVoteSessionId > 0) {
+        retryDiscovery();
+        setIsQuickVoteOpen(true);
+        return;
+      }
+
       const sessionId =
         reservedSessionIdRef.current ?? lastIssuedSessionIdRef.current + 1;
 
@@ -49,7 +82,7 @@ export const useMemesQuickVoteDialogController =
       reservedSessionIdRef.current = null;
       setQuickVoteSessionId(sessionId);
       setIsQuickVoteOpen(true);
-    }, []);
+    }, [quickVoteSessionId, retryDiscovery]);
 
     const closeQuickVote = useCallback(() => {
       setIsQuickVoteOpen(false);
@@ -57,6 +90,22 @@ export const useMemesQuickVoteDialogController =
 
     return {
       closeQuickVote,
+      dialogState: {
+        activeDrop: quickVoteQueue.activeDrop,
+        hasDiscoveryError: quickVoteQueue.hasDiscoveryError,
+        isExhausted: quickVoteQueue.isExhausted,
+        isOpen: isQuickVoteOpen,
+        latestUsedAmount: quickVoteQueue.latestUsedAmount,
+        onClose: closeQuickVote,
+        recentAmounts: quickVoteQueue.recentAmounts,
+        remainingCount: quickVoteQueue.remainingCount,
+        retryDiscovery: quickVoteQueue.retryDiscovery,
+        sessionId: quickVoteSessionId,
+        skipDrop: quickVoteQueue.skipDrop,
+        submitVote: quickVoteQueue.submitVote,
+        uncastPower: quickVoteQueue.uncastPower,
+        votingLabel: quickVoteQueue.votingLabel,
+      },
       isQuickVoteOpen,
       openQuickVote,
       prefetchQuickVote,
diff --git a/hooks/useMemesQuickVoteDiscovery.ts b/hooks/useMemesQuickVoteDiscovery.ts
deleted file mode 100644
index 4d1b0bddbc..0000000000
--- a/hooks/useMemesQuickVoteDiscovery.ts
+++ /dev/null
@@ -1,282 +0,0 @@
-"use client";
-
-import {
-  appendSkippedDropId,
-  MEMES_QUICK_VOTE_REPLENISH_THRESHOLD,
-} from "@/hooks/memesQuickVote.helpers";
-import {
-  createInitialMemesQuickVoteDiscoveryState,
-  deferMemesQuickVoteDropId,
-  deriveMemesQuickVoteDiscoverySnapshot,
-  getMemesQuickVoteActiveCandidateId,
-  getMemesQuickVoteDiscoveredQueue,
-  getMemesQuickVoteNextCandidateId,
-  isMemesQuickVoteExhausted,
-  type MemesQuickVoteDiscoveryPage,
-  type MemesQuickVoteDiscoveryState,
-  removeMemesQuickVoteDropId,
-  shouldFetchMemesQuickVotePage,
-} from "@/hooks/memesQuickVote.queue.helpers";
-import {
-  fetchMemesQuickVoteDiscoveryBatch,
-  getMemesQuickVoteDiscoveryQueryKey,
-  getMemesQuickVoteDiscoveryStateKey,
-  type MemesQuickVoteDiscoveryQueryData,
-} from "@/hooks/memesQuickVote.query";
-import { useMemesQuickVoteContext } from "@/hooks/useMemesQuickVoteContext";
-import { useQuery } from "@tanstack/react-query";
-import { useCallback, useState } from "react";
-
-const EMPTY_DISCOVERY_PAGES: readonly MemesQuickVoteDiscoveryPage[] = [];
-
-type KeyedMemesQuickVoteDiscoveryState = MemesQuickVoteDiscoveryState & {
-  readonly fetchVersion: number;
-  readonly key: string;
-};
-
-const createKeyedMemesQuickVoteDiscoveryState = (
-  key: string
-): KeyedMemesQuickVoteDiscoveryState => ({
-  ...createInitialMemesQuickVoteDiscoveryState(),
-  fetchVersion: 0,
-  key,
-});
-
-const getCurrentMemesQuickVoteDiscoveryState = ({
-  key,
-  state,
-}: {
-  readonly key: string;
-  readonly state: KeyedMemesQuickVoteDiscoveryState;
-}): KeyedMemesQuickVoteDiscoveryState =>
-  state.key === key ? state : createKeyedMemesQuickVoteDiscoveryState(key);
-
-const getMemesQuickVoteDiscoveryQueryKeyIdentity = (
-  candidate: unknown
-): string | null => {
-  if (candidate === undefined || candidate === null) {
-    return null;
-  }
-
-  if (typeof candidate !== "object" || !("identity" in candidate)) {
-    return null;
-  }
-
-  const identity = candidate.identity;
-
-  return typeof identity === "string" ? identity : null;
-};
-
-const shouldReuseDiscoveryPlaceholderData = ({
-  identity,
-  previousQuery,
-}: {
-  readonly identity: string;
-  readonly previousQuery:
-    | {
-        readonly queryKey: readonly unknown[];
-      }
-    | undefined;
-}): boolean => {
-  const previousQueryIdentity = getMemesQuickVoteDiscoveryQueryKeyIdentity(
-    previousQuery?.queryKey[1]
-  );
-
-  return previousQueryIdentity === identity;
-};
-
-const applyMemesQuickVoteDiscoveryStateUpdate = ({
-  current,
-  discoveryPages,
-  discoveryStateKey,
-  isDiscoveryEnabled,
-  nextSkippedDropIds,
-  transformState,
-}: {
-  readonly current: KeyedMemesQuickVoteDiscoveryState;
-  readonly discoveryPages: readonly MemesQuickVoteDiscoveryPage[];
-  readonly discoveryStateKey: string;
-  readonly isDiscoveryEnabled: boolean;
-  readonly nextSkippedDropIds: readonly string[];
-  readonly transformState: (
-    state: KeyedMemesQuickVoteDiscoveryState
-  ) => MemesQuickVoteDiscoveryState;
-}): KeyedMemesQuickVoteDiscoveryState => {
-  const baseState = getCurrentMemesQuickVoteDiscoveryState({
-    key: discoveryStateKey,
-    state: current,
-  });
-  const nextState = transformState(baseState);
-
-  if (nextState === baseState) {
-    return baseState;
-  }
-
-  const nextSnapshot = deriveMemesQuickVoteDiscoverySnapshot({
-    enabled: isDiscoveryEnabled,
-    pages: discoveryPages,
-    skippedDropIds: nextSkippedDropIds,
-    state: nextState,
-  });
-
-  return {
-    ...nextState,
-    fetchVersion: shouldFetchMemesQuickVotePage({
-      replenishThreshold: MEMES_QUICK_VOTE_REPLENISH_THRESHOLD,
-      state: nextSnapshot,
-    })
-      ? baseState.fetchVersion + 1
-      : baseState.fetchVersion,
-    key: discoveryStateKey,
-  };
-};
-
-export const useMemesQuickVoteDiscovery = ({
-  enabled,
-  sessionId,
-  skippedDropIds,
-}: {
-  readonly enabled: boolean;
-  readonly sessionId: number;
-  readonly skippedDropIds: readonly string[];
-}) => {
-  const { contextProfile, isEnabled, memesWaveId } = useMemesQuickVoteContext();
-  const waveId =
-    typeof memesWaveId === "string" && memesWaveId.length > 0
-      ? memesWaveId
-      : null;
-  const isDiscoveryEnabled = enabled && isEnabled;
-  const discoveryStateKey = getMemesQuickVoteDiscoveryStateKey({
-    contextProfile,
-    enabled: isDiscoveryEnabled,
-    memesWaveId: waveId,
-    sessionId,
-  });
-  const [storedState, setStoredState] =
-    useState<KeyedMemesQuickVoteDiscoveryState>(() =>
-      createKeyedMemesQuickVoteDiscoveryState(discoveryStateKey)
-    );
-  const discoveryState = getCurrentMemesQuickVoteDiscoveryState({
-    key: discoveryStateKey,
-    state: storedState,
-  });
-  const queryKey = getMemesQuickVoteDiscoveryQueryKey({
-    discoveryStateKey,
-    fetchVersion: discoveryState.fetchVersion,
-    waveId,
-  });
-  const fetchDiscoveryBatch = useCallback(
-    async (): Promise<MemesQuickVoteDiscoveryQueryData> =>
-      await fetchMemesQuickVoteDiscoveryBatch({
-        discoveryState,
-        skippedDropIds,
-        waveId,
-      }),
-    [discoveryState, skippedDropIds, waveId]
-  );
-
-  const {
-    data: discoveryData,
-    isError: hasPageFetchError,
-    isFetching: isFetchingPage,
-    refetch: refetchDiscovery,
-  } = useQuery({
-    queryKey,
-    enabled: isDiscoveryEnabled && waveId !== null,
-    queryFn: fetchDiscoveryBatch,
-    placeholderData: (previousData, previousQuery) =>
-      shouldReuseDiscoveryPlaceholderData({
-        identity: discoveryStateKey,
-        previousQuery,
-      })
-        ? previousData
-        : undefined,
-    refetchOnReconnect: false,
-    refetchOnWindowFocus: false,
-    retry: false,
-  });
-
-  const discoveryPages = discoveryData?.pages ?? EMPTY_DISCOVERY_PAGES;
-  const discoverySnapshot = deriveMemesQuickVoteDiscoverySnapshot({
-    enabled: isDiscoveryEnabled,
-    pages: discoveryPages,
-    skippedDropIds,
-    state: discoveryState,
-  });
-  const activeCandidateId =
-    getMemesQuickVoteActiveCandidateId(discoverySnapshot);
-  const nextCandidateId = getMemesQuickVoteNextCandidateId(discoverySnapshot);
-  const queue = getMemesQuickVoteDiscoveredQueue(discoverySnapshot);
-
-  const removeDropId = useCallback(
-    (dropId: string) => {
-      setStoredState((current) =>
-        applyMemesQuickVoteDiscoveryStateUpdate({
-          current,
-          discoveryPages,
-          discoveryStateKey,
-          isDiscoveryEnabled,
-          nextSkippedDropIds: skippedDropIds.filter(
-            (value) => value !== dropId
-          ),
-          transformState: (state) =>
-            removeMemesQuickVoteDropId({ dropId, state }),
-        })
-      );
-    },
-    [discoveryPages, discoveryStateKey, isDiscoveryEnabled, skippedDropIds]
-  );
-
-  const hideDropId = useCallback(
-    (dropId: string) => {
-      setStoredState((current) =>
-        applyMemesQuickVoteDiscoveryStateUpdate({
-          current,
-          discoveryPages,
-          discoveryStateKey,
-          isDiscoveryEnabled,
-          nextSkippedDropIds: appendSkippedDropId(skippedDropIds, dropId),
-          transformState: (state) =>
-            deferMemesQuickVoteDropId({ dropId, state }),
-        })
-      );
-    },
-    [discoveryPages, discoveryStateKey, isDiscoveryEnabled, skippedDropIds]
-  );
-
-  const retryDiscovery = useCallback(() => {
-    void refetchDiscovery();
-  }, [refetchDiscovery]);
-
-  const resyncDiscovery = useCallback(() => {
-    setStoredState((current) => {
-      const baseState = getCurrentMemesQuickVoteDiscoveryState({
-        key: discoveryStateKey,
-        state: current,
-      });
-
-      return {
-        ...createInitialMemesQuickVoteDiscoveryState(),
-        fetchVersion: baseState.fetchVersion + 1,
-        key: discoveryStateKey,
-      };
-    });
-  }, [discoveryStateKey]);
-
-  return {
-    activeCandidateId,
-    discoveredDropsById: discoverySnapshot.discoveredDropsById,
-    hasPageFetchError,
-    hideDropId,
-    isExhausted: isDiscoveryEnabled
-      ? isMemesQuickVoteExhausted(discoverySnapshot)
-      : false,
-    isFetchingPage,
-    nextCandidateId,
-    queue,
-    removeDropId,
-    resyncDiscovery,
-    retryDiscovery,
-    serverCount: discoverySnapshot.serverCount,
-  };
-};
diff --git a/hooks/useMemesQuickVoteHiddenSummaryCleanup.ts b/hooks/useMemesQuickVoteHiddenSummaryCleanup.ts
deleted file mode 100644
index 0a4e179d42..0000000000
--- a/hooks/useMemesQuickVoteHiddenSummaryCleanup.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-"use client";
-
-import { getDefaultQueryRetry } from "@/components/react-query-wrapper/utils/query-utils";
-import type { ApiDrop } from "@/generated/models/ApiDrop";
-import { isMemesQuickVoteMissingDropError } from "@/hooks/memesQuickVote.errors";
-import { isMemesQuickVoteDiscoverableDrop } from "@/hooks/memesQuickVote.helpers";
-import {
-  fetchMemesQuickVoteDrop,
-  getMemesQuickVoteDropQueryKey,
-} from "@/hooks/memesQuickVote.query";
-import { useMemesQuickVoteContext } from "@/hooks/useMemesQuickVoteContext";
-import { useQuery } from "@tanstack/react-query";
-import { useMemo } from "react";
-
-export const useMemesQuickVoteHiddenSummaryCleanup = ({
-  activeCandidateId,
-  enabled,
-  isFetchingPage,
-  isSummarySuccess,
-  memesWaveId,
-  onClearHiddenSummaryDrop,
-  skippedDropIds,
-  summaryFirstDrop,
-}: {
-  readonly activeCandidateId: string | null;
-  readonly enabled: boolean;
-  readonly isFetchingPage: boolean;
-  readonly isSummarySuccess: boolean;
-  readonly memesWaveId: string | null | undefined;
-  readonly onClearHiddenSummaryDrop: (dropId: string) => void;
-  readonly skippedDropIds: readonly string[];
-  readonly summaryFirstDrop: ApiDrop | null;
-}) => {
-  const { contextProfile, proxyId } = useMemesQuickVoteContext();
-  const hiddenSummaryDropId = useMemo(() => {
-    if (
-      !enabled ||
-      !isSummarySuccess ||
-      !summaryFirstDrop ||
-      !skippedDropIds.includes(summaryFirstDrop.id) ||
-      activeCandidateId !== null ||
-      isFetchingPage
-    ) {
-      return null;
-    }
-
-    return summaryFirstDrop.id;
-  }, [
-    activeCandidateId,
-    enabled,
-    isFetchingPage,
-    isSummarySuccess,
-    skippedDropIds,
-    summaryFirstDrop,
-  ]);
-
-  useQuery({
-    queryKey: hiddenSummaryDropId
-      ? getMemesQuickVoteDropQueryKey({
-          contextProfile,
-          dropId: hiddenSummaryDropId,
-          proxyId,
-        })
-      : ["memes-quick-vote-hidden-summary-drop", null],
-    queryFn: async () => {
-      const dropId = hiddenSummaryDropId;
-
-      if (dropId === null) {
-        return null;
-      }
-
-      try {
-        const drop = await fetchMemesQuickVoteDrop(dropId);
-
-        if (
-          !isMemesQuickVoteDiscoverableDrop({
-            drop,
-            waveId: memesWaveId,
-          })
-        ) {
-          onClearHiddenSummaryDrop(dropId);
-          return null;
-        }
-
-        return drop;
-      } catch (error) {
-        if (isMemesQuickVoteMissingDropError(error)) {
-          onClearHiddenSummaryDrop(dropId);
-          return null;
-        }
-
-        throw error;
-      }
-    },
-    enabled: hiddenSummaryDropId !== null,
-    ...getDefaultQueryRetry(),
-    refetchOnReconnect: false,
-    refetchOnWindowFocus: false,
-    retry: false,
-    staleTime: 0,
-  });
-};
diff --git a/hooks/useMemesQuickVoteQueue.optimistic.ts b/hooks/useMemesQuickVoteQueue.optimistic.ts
deleted file mode 100644
index 403ee83084..0000000000
--- a/hooks/useMemesQuickVoteQueue.optimistic.ts
+++ /dev/null
@@ -1,315 +0,0 @@
-"use client";
-
-import type { ExtendedDrop } from "@/helpers/waves/drop.helpers";
-import { useCallback, useMemo } from "react";
-
-export type OptimisticRemainingPowerState = {
-  readonly key: string;
-  readonly pendingVotes: {
-    readonly amount: number;
-    readonly dropId: string;
-  }[];
-  readonly optimisticVoteCount: number;
-  readonly settledRemainingPower: number | null;
-  readonly summaryBaselineCount: number | null;
-};
-
-type SetOptimisticRemainingPowerState = React.Dispatch<
-  React.SetStateAction<OptimisticRemainingPowerState>
->;
-
-type UseMemesQuickVoteOptimisticStateOptions = {
-  readonly isSummarySuccess: boolean;
-  readonly optimisticRemainingPowerKey: string;
-  readonly optimisticRemainingPowerState: OptimisticRemainingPowerState;
-  readonly summaryCount: number;
-};
-
-type UseMemesQuickVoteVoteHandlersOptions = {
-  readonly isSummarySuccess: boolean;
-  readonly optimisticRemainingPowerKey: string;
-  readonly refetchSummary: () => Promise<unknown>;
-  readonly removeDropId: (dropId: string) => void;
-  readonly resyncDiscovery: () => void;
-  readonly setAndPersistSkippedDropIds: (
-    updater: (current: string[]) => string[]
-  ) => void;
-  readonly setOptimisticRemainingPowerState: SetOptimisticRemainingPowerState;
-  readonly summaryCount: number;
-};
-
-export const getOptimisticRemainingPowerKey = ({
-  contextProfile,
-  memesWaveId,
-  sessionId,
-}: {
-  readonly contextProfile: string | null | undefined;
-  readonly memesWaveId: string | null | undefined;
-  readonly sessionId: number;
-}): string => `${sessionId}:${memesWaveId ?? ""}:${contextProfile ?? ""}`;
-
-export const createInitialOptimisticRemainingPowerState = (
-  key: string
-): OptimisticRemainingPowerState => ({
-  key,
-  pendingVotes: [],
-  optimisticVoteCount: 0,
-  settledRemainingPower: null,
-  summaryBaselineCount: null,
-});
-
-const getCurrentOptimisticRemainingPowerState = ({
-  key,
-  state,
-}: {
-  readonly key: string;
-  readonly state: OptimisticRemainingPowerState;
-}): OptimisticRemainingPowerState =>
-  state.key === key ? state : createInitialOptimisticRemainingPowerState(key);
-
-const deriveSummaryOptimismState = ({
-  hasPendingVotes,
-  isSummarySuccess,
-  optimisticVoteCount,
-  summaryBaselineCount,
-  summaryCount,
-}: {
-  readonly hasPendingVotes: boolean;
-  readonly isSummarySuccess: boolean;
-  readonly optimisticVoteCount: number;
-  readonly summaryBaselineCount: number | null;
-  readonly summaryCount: number;
-}) => {
-  if (summaryBaselineCount === null || optimisticVoteCount === 0) {
-    return {
-      isSettled: true,
-      unreflectedVoteCount: 0,
-    };
-  }
-
-  const reflectedVoteCount = isSummarySuccess
-    ? Math.max(0, summaryBaselineCount - summaryCount)
-    : 0;
-  const isSettled =
-    !hasPendingVotes &&
-    isSummarySuccess &&
-    reflectedVoteCount >= optimisticVoteCount;
-
-  return {
-    isSettled,
-    unreflectedVoteCount: isSettled
-      ? 0
-      : Math.max(0, optimisticVoteCount - reflectedVoteCount),
-  };
-};
-
-export const useMemesQuickVoteOptimisticState = ({
-  isSummarySuccess,
-  optimisticRemainingPowerKey,
-  optimisticRemainingPowerState,
-  summaryCount,
-}: UseMemesQuickVoteOptimisticStateOptions) => {
-  const currentOptimisticRemainingPowerState =
-    getCurrentOptimisticRemainingPowerState({
-      key: optimisticRemainingPowerKey,
-      state: optimisticRemainingPowerState,
-    });
-  const hasPendingOptimisticVotes =
-    currentOptimisticRemainingPowerState.pendingVotes.length > 0;
-  const optimisticRemainingPower = useMemo(() => {
-    const pendingSpent =
-      currentOptimisticRemainingPowerState.pendingVotes.reduce(
-        (sum, vote) => sum + vote.amount,
-        0
-      );
-    const settledRemainingPower =
-      currentOptimisticRemainingPowerState.settledRemainingPower;
-
-    if (settledRemainingPower === null) {
-      return null;
-    }
-
-    return Math.max(0, settledRemainingPower - pendingSpent);
-  }, [currentOptimisticRemainingPowerState]);
-  const summaryOptimismState = useMemo(
-    () =>
-      deriveSummaryOptimismState({
-        hasPendingVotes: hasPendingOptimisticVotes,
-        isSummarySuccess,
-        optimisticVoteCount:
-          currentOptimisticRemainingPowerState.optimisticVoteCount,
-        summaryBaselineCount:
-          currentOptimisticRemainingPowerState.summaryBaselineCount,
-        summaryCount,
-      }),
-    [
-      currentOptimisticRemainingPowerState.optimisticVoteCount,
-      currentOptimisticRemainingPowerState.summaryBaselineCount,
-      hasPendingOptimisticVotes,
-      isSummarySuccess,
-      summaryCount,
-    ]
-  );
-
-  return {
-    hasPendingOptimisticVotes,
-    optimisticRemainingPower,
-    summaryOptimismState,
-  };
-};
-
-export const useMemesQuickVoteVoteHandlers = ({
-  isSummarySuccess,
-  optimisticRemainingPowerKey,
-  refetchSummary,
-  removeDropId,
-  resyncDiscovery,
-  setAndPersistSkippedDropIds,
-  setOptimisticRemainingPowerState,
-  summaryCount,
-}: UseMemesQuickVoteVoteHandlersOptions) => {
-  const handleInvalidatedDrop = useCallback(
-    (dropId: string) => {
-      removeDropId(dropId);
-      setAndPersistSkippedDropIds((current) =>
-        current.filter((value) => value !== dropId)
-      );
-      void refetchSummary();
-    },
-    [removeDropId, refetchSummary, setAndPersistSkippedDropIds]
-  );
-
-  const handleVoteQueued = useCallback(
-    (drop: ExtendedDrop, amount: number) => {
-      removeDropId(drop.id);
-      setOptimisticRemainingPowerState((current) => {
-        const baseState = getCurrentOptimisticRemainingPowerState({
-          key: optimisticRemainingPowerKey,
-          state: current,
-        });
-        const reflectedVoteCount =
-          baseState.summaryBaselineCount === null || !isSummarySuccess
-            ? 0
-            : Math.max(0, baseState.summaryBaselineCount - summaryCount);
-        const isSummaryCycleSettled =
-          baseState.summaryBaselineCount !== null &&
-          baseState.optimisticVoteCount > 0 &&
-          baseState.pendingVotes.length === 0 &&
-          isSummarySuccess &&
-          reflectedVoteCount >= baseState.optimisticVoteCount;
-        const shouldResetSummaryCycle =
-          baseState.summaryBaselineCount === null ||
-          baseState.optimisticVoteCount === 0 ||
-          isSummaryCycleSettled;
-
-        return {
-          ...baseState,
-          pendingVotes: [
-            ...baseState.pendingVotes,
-            {
-              amount,
-              dropId: drop.id,
-            },
-          ],
-          settledRemainingPower:
-            baseState.pendingVotes.length === 0
-              ? (drop.context_profile_context?.max_rating ?? null)
-              : (baseState.settledRemainingPower ??
-                drop.context_profile_context?.max_rating ??
-                null),
-          optimisticVoteCount:
-            shouldResetSummaryCycle || !isSummarySuccess
-              ? 1
-              : baseState.optimisticVoteCount + 1,
-          summaryBaselineCount:
-            isSummarySuccess && shouldResetSummaryCycle
-              ? summaryCount
-              : baseState.summaryBaselineCount,
-        };
-      });
-    },
-    [
-      isSummarySuccess,
-      optimisticRemainingPowerKey,
-      removeDropId,
-      setOptimisticRemainingPowerState,
-      summaryCount,
-    ]
-  );
-
-  const handleVoteSuccess = useCallback(
-    (_drop: ExtendedDrop, _amount: number, nextRemainingPower: number) => {
-      setOptimisticRemainingPowerState((current) => {
-        const baseState = getCurrentOptimisticRemainingPowerState({
-          key: optimisticRemainingPowerKey,
-          state: current,
-        });
-        const currentVote = baseState.pendingVotes[0];
-
-        if (!currentVote) {
-          return {
-            ...baseState,
-            settledRemainingPower: nextRemainingPower,
-          };
-        }
-
-        return {
-          ...baseState,
-          pendingVotes: baseState.pendingVotes.slice(1),
-          settledRemainingPower: nextRemainingPower,
-        };
-      });
-    },
-    [optimisticRemainingPowerKey, setOptimisticRemainingPowerState]
-  );
-
-  const handleVoteFailure = useCallback(
-    (_drop: ExtendedDrop, _amount: number) => {
-      setOptimisticRemainingPowerState((current) => {
-        const baseState = getCurrentOptimisticRemainingPowerState({
-          key: optimisticRemainingPowerKey,
-          state: current,
-        });
-
-        if (baseState.pendingVotes.length === 0) {
-          return baseState;
-        }
-
-        const nextPendingVotes = baseState.pendingVotes.slice(1);
-        const nextOptimisticVoteCount = Math.max(
-          0,
-          baseState.optimisticVoteCount - 1
-        );
-
-        return {
-          ...baseState,
-          pendingVotes: nextPendingVotes,
-          optimisticVoteCount: nextOptimisticVoteCount,
-          settledRemainingPower:
-            nextPendingVotes.length === 0
-              ? null
-              : baseState.settledRemainingPower,
-          summaryBaselineCount:
-            nextOptimisticVoteCount === 0
-              ? null
-              : baseState.summaryBaselineCount,
-        };
-      });
-      resyncDiscovery();
-      void refetchSummary();
-    },
-    [
-      optimisticRemainingPowerKey,
-      refetchSummary,
-      resyncDiscovery,
-      setOptimisticRemainingPowerState,
-    ]
-  );
-
-  return {
-    handleInvalidatedDrop,
-    handleVoteFailure,
-    handleVoteQueued,
-    handleVoteSuccess,
-  };
-};
diff --git a/hooks/useMemesQuickVoteQueue.ts b/hooks/useMemesQuickVoteQueue.ts
index 8aca698d7d..bffafb9510 100644
--- a/hooks/useMemesQuickVoteQueue.ts
+++ b/hooks/useMemesQuickVoteQueue.ts
@@ -1,46 +1,62 @@
 "use client";
 
 import { AuthContext } from "@/components/auth/Auth";
-import { ReactQueryWrapperContext } from "@/components/react-query-wrapper/ReactQueryWrapper";
-import type { ApiDrop } from "@/generated/models/ApiDrop";
 import type { ExtendedDrop } from "@/helpers/waves/drop.helpers";
+import { convertApiDropToExtendedDrop } from "@/helpers/waves/drop.helpers";
+import { WAVE_VOTING_LABELS } from "@/helpers/waves/waves.constants";
 import {
-  appendSkippedDropId,
   getDisplayQuickVoteAmounts,
-  getMemesQuickVoteRemainingCount,
+  isMemesQuickVoteVoteableDrop,
 } from "@/hooks/memesQuickVote.helpers";
-import { useMemesQuickVoteActiveDrop } from "@/hooks/useMemesQuickVoteActiveDrop";
-import { useMemesQuickVoteContext } from "@/hooks/useMemesQuickVoteContext";
-import { useMemesQuickVoteDiscovery } from "@/hooks/useMemesQuickVoteDiscovery";
-import { useMemesQuickVoteHiddenSummaryCleanup } from "@/hooks/useMemesQuickVoteHiddenSummaryCleanup";
 import {
+  applyFailedDropRestoreState,
+  applyFetchedWindowState,
+  applyOptimisticAdvanceState,
+  clampDropMaxRating,
   createInitialOptimisticRemainingPowerState,
-  getOptimisticRemainingPowerKey,
-  type OptimisticRemainingPowerState,
-  useMemesQuickVoteOptimisticState,
-  useMemesQuickVoteVoteHandlers,
-} from "@/hooks/useMemesQuickVoteQueue.optimistic";
+  createInitialSessionState,
+  getCurrentOptimisticRemainingPowerState,
+  getEffectiveOptimisticRemainingPower,
+  getUniqueDrops,
+  reconcileOptimisticRemainingPower,
+  reduceOptimisticRemainingPower,
+  restoreOptimisticRemainingPower,
+  type KeyedOptimisticRemainingPowerState,
+  type MemesQuickVoteSessionState,
+} from "@/hooks/memesQuickVote.queue.state";
+import {
+  fetchMemesQuickVoteUndiscoveredDrop,
+  MEMES_QUICK_VOTE_LOOKAHEAD_COUNT,
+  MEMES_QUICK_VOTE_UNDISCOVERED_DROP_QUERY_KEY,
+} from "@/hooks/memesQuickVote.query";
+import { useMemesQuickVoteContext } from "@/hooks/useMemesQuickVoteContext";
 import { useMemesQuickVoteStorage } from "@/hooks/useMemesQuickVoteStorage";
 import { useMemesQuickVoteSubmit } from "@/hooks/useMemesQuickVoteSubmit";
-import { useMemesQuickVoteSummary } from "@/hooks/useMemesQuickVoteSummary";
-import { convertApiDropToExtendedDrop } from "@/helpers/waves/drop.helpers";
-import { WAVE_VOTING_LABELS } from "@/helpers/waves/waves.constants";
-import { useCallback, useContext, useMemo, useState } from "react";
+import { useQueryClient } from "@tanstack/react-query";
+import {
+  type ContextType,
+  type Dispatch,
+  type SetStateAction,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 
 type UseMemesQuickVoteQueueOptions = {
   readonly enabled?: boolean | undefined;
   readonly sessionId: number;
 };
 
-type UseMemesQuickVoteQueueResult = {
+export type UseMemesQuickVoteQueueResult = {
   readonly activeDrop: ExtendedDrop | null;
   readonly hasDiscoveryError: boolean;
   readonly isExhausted: boolean;
   readonly isLoading: boolean;
   readonly isReady: boolean;
-  readonly isVoting: boolean;
   readonly latestUsedAmount: number | null;
-  readonly queue: ExtendedDrop[];
   readonly recentAmounts: number[];
   readonly remainingCount: number;
   readonly retryDiscovery: () => void;
@@ -48,452 +64,620 @@ type UseMemesQuickVoteQueueResult = {
     drop: ExtendedDrop,
     amount: number | string
   ) => Promise<boolean>;
-  readonly skipDrop: (drop: ExtendedDrop) => void;
+  readonly skipDrop: (drop: ExtendedDrop) => Promise<boolean>;
   readonly uncastPower: number | null;
   readonly votingLabel: string | null;
 };
 
-type UseMemesQuickVoteQueueDerivedState = Pick<
-  UseMemesQuickVoteQueueResult,
-  | "activeDrop"
-  | "hasDiscoveryError"
-  | "isExhausted"
-  | "isLoading"
-  | "isReady"
-  | "latestUsedAmount"
-  | "queue"
-  | "recentAmounts"
-  | "remainingCount"
-  | "uncastPower"
-  | "votingLabel"
->;
-
-type UseDerivedMemesQuickVoteQueueStateOptions = {
-  readonly activeDropCandidate: ExtendedDrop | null;
-  readonly activeIsLoading: boolean;
-  readonly discoveredQueue: readonly ApiDrop[];
-  readonly effectiveOptimisticRemainingPower: number | null;
-  readonly enabled: boolean;
-  readonly hasPageFetchError: boolean;
-  readonly hiddenSkippedCount: number;
-  readonly isDiscoveryExhausted: boolean;
-  readonly isFetchingPage: boolean;
-  readonly isSettingsLoaded: boolean;
-  readonly isSummaryPending: boolean;
-  readonly isSummaryQuickVoteEnabled: boolean;
-  readonly isSummarySuccess: boolean;
-  readonly recentAmountsByRecency: readonly number[];
-  readonly serverCount: number | null;
-  readonly summaryCount: number;
-  readonly unreflectedVoteCount: number;
-  readonly summaryVotingLabel: string | null;
+type KeyedSessionState = {
+  readonly key: string;
+  readonly value: MemesQuickVoteSessionState;
 };
 
-type UseMemesQuickVoteQueueActionsOptions = {
-  readonly activeCandidateId: string | null;
-  readonly discoveredDropsById: Record<string, ApiDrop>;
+type UseMemesQuickVoteSessionStateOptions = {
+  readonly contextProfile: string | null | undefined;
   readonly enabled: boolean;
-  readonly hideDropId: (dropId: string) => void;
-  readonly invalidateDrops: React.ContextType<
-    typeof ReactQueryWrapperContext
-  >["invalidateDrops"];
   readonly isQuickVoteEnabled: boolean;
-  readonly isSummarySuccess: boolean;
-  readonly nextCandidateId: string | null;
-  readonly optimisticRemainingPowerKey: string;
-  readonly optimisticRemainingPowerState: OptimisticRemainingPowerState;
-  readonly refetchSummary: () => Promise<unknown>;
-  readonly removeDropId: (dropId: string) => void;
-  readonly requestAuth: React.ContextType<typeof AuthContext>["requestAuth"];
-  readonly resyncDiscovery: () => void;
-  readonly setAndPersistRecentAmounts: (
-    updater: (current: number[]) => number[]
-  ) => void;
-  readonly setAndPersistSkippedDropIds: (
-    updater: (current: string[]) => string[]
-  ) => void;
-  readonly setOptimisticRemainingPowerState: React.Dispatch<
-    React.SetStateAction<OptimisticRemainingPowerState>
-  >;
-  readonly setToast: React.ContextType<typeof AuthContext>["setToast"];
-  readonly summaryCount: number;
+  readonly isSettingsLoaded: boolean;
+  readonly pendingDropIdsRef: { current: readonly string[] };
+  readonly stateKey: string;
+  readonly waveId: string | null;
 };
 
-const clampDropMaxRating = (
-  drop: ExtendedDrop,
-  optimisticRemainingPower: number | null
-): ExtendedDrop => {
-  const profileContext = drop.context_profile_context;
-  const maxRating = profileContext?.max_rating;
-
-  if (
-    optimisticRemainingPower === null ||
-    profileContext?.rating !== 0 ||
-    typeof maxRating !== "number"
-  ) {
-    return drop;
-  }
-
-  const nextMaxRating = Math.max(
-    0,
-    Math.min(maxRating, optimisticRemainingPower)
-  );
+type UseMemesQuickVoteSessionStateResult = {
+  readonly advanceVisibleDrop: (drop: ExtendedDrop) => void;
+  readonly restoreFailedDrop: (drop: ExtendedDrop) => void;
+  readonly sessionState: MemesQuickVoteSessionState;
+  readonly syncUndiscoveredWindow: () => Promise<void>;
+};
 
-  if (nextMaxRating === maxRating) {
-    return drop;
-  }
+type UseKeyedMemesQuickVoteSessionStoreResult = {
+  readonly currentSessionState: MemesQuickVoteSessionState;
+  readonly setCurrentSessionState: (
+    nextState:
+      | MemesQuickVoteSessionState
+      | ((current: MemesQuickVoteSessionState) => MemesQuickVoteSessionState)
+  ) => void;
+};
 
-  return {
-    ...drop,
-    context_profile_context: {
-      ...profileContext,
-      max_rating: nextMaxRating,
-    },
-  };
+type UseMemesQuickVoteWindowSyncOptions = Omit<
+  UseMemesQuickVoteSessionStateOptions,
+  "stateKey"
+> & {
+  readonly setCurrentSessionState: UseKeyedMemesQuickVoteSessionStoreResult["setCurrentSessionState"];
 };
 
-const isVoteableQuickVoteDrop = (drop: ExtendedDrop | null): boolean => {
-  const profileContext = drop?.context_profile_context;
+const runBestEffortSync = (sync: () => Promise<void>): void => {
+  sync().catch(() => {
+    // Session state already models sync failures; callers should not block on this.
+  });
+};
+
+const getCurrentSessionState = ({
+  key,
+  state,
+}: {
+  readonly key: string;
+  readonly state: KeyedSessionState;
+}): MemesQuickVoteSessionState =>
+  state.key === key ? state.value : createInitialSessionState();
 
-  return (
-    profileContext?.rating === 0 &&
-    typeof profileContext.max_rating === "number" &&
-    profileContext.max_rating > 0
+const useKeyedMemesQuickVoteSessionStore = (
+  stateKey: string
+): UseKeyedMemesQuickVoteSessionStoreResult => {
+  const [sessionState, setSessionState] = useState<KeyedSessionState>(() => ({
+    key: stateKey,
+    value: createInitialSessionState(),
+  }));
+
+  const setCurrentSessionState = useCallback(
+    (
+      nextState:
+        | MemesQuickVoteSessionState
+        | ((current: MemesQuickVoteSessionState) => MemesQuickVoteSessionState)
+    ) => {
+      setSessionState((current) => {
+        const baseState = getCurrentSessionState({
+          key: stateKey,
+          state: current,
+        });
+        const value =
+          typeof nextState === "function" ? nextState(baseState) : nextState;
+
+        return {
+          key: stateKey,
+          value,
+        };
+      });
+    },
+    [stateKey]
   );
+
+  return {
+    currentSessionState: getCurrentSessionState({
+      key: stateKey,
+      state: sessionState,
+    }),
+    setCurrentSessionState,
+  };
 };
 
-const useDerivedMemesQuickVoteQueueState = ({
-  activeDropCandidate,
-  activeIsLoading,
-  discoveredQueue,
-  effectiveOptimisticRemainingPower,
+const useMemesQuickVoteWindowSync = ({
+  contextProfile,
   enabled,
-  hasPageFetchError,
-  hiddenSkippedCount,
-  isDiscoveryExhausted,
-  isFetchingPage,
+  isQuickVoteEnabled,
   isSettingsLoaded,
-  isSummaryPending,
-  isSummaryQuickVoteEnabled,
-  isSummarySuccess,
-  recentAmountsByRecency,
-  serverCount,
-  summaryCount,
-  unreflectedVoteCount,
-  summaryVotingLabel,
-}: UseDerivedMemesQuickVoteQueueStateOptions): UseMemesQuickVoteQueueDerivedState => {
-  const clampedActiveDrop = useMemo(
-    () =>
-      activeDropCandidate
-        ? clampDropMaxRating(
-            activeDropCandidate,
-            effectiveOptimisticRemainingPower
-          )
-        : null,
-    [activeDropCandidate, effectiveOptimisticRemainingPower]
-  );
-  const activeDrop = isVoteableQuickVoteDrop(clampedActiveDrop)
-    ? clampedActiveDrop
-    : null;
-
-  const queue = useMemo(() => {
-    const clampedQueue = discoveredQueue
-      .map(convertApiDropToExtendedDrop)
-      .map((drop) =>
-        clampDropMaxRating(drop, effectiveOptimisticRemainingPower)
-      );
+  pendingDropIdsRef,
+  setCurrentSessionState,
+  waveId,
+}: UseMemesQuickVoteWindowSyncOptions) => {
+  const syncAbortControllerRef = useRef<AbortController | null>(null);
+  const syncRequestIdRef = useRef(0);
+  const syncRetryTimeoutRef = useRef<ReturnType<
+    typeof globalThis.setTimeout
+  > | null>(null);
 
-    if (!clampedActiveDrop) {
-      return clampedQueue;
+  const clearSyncRetryTimeout = useCallback(() => {
+    if (syncRetryTimeoutRef.current === null) {
+      return;
     }
 
-    return clampedQueue.map((drop) =>
-      drop.id === clampedActiveDrop.id ? clampedActiveDrop : drop
-    );
-  }, [clampedActiveDrop, discoveredQueue, effectiveOptimisticRemainingPower]);
+    globalThis.clearTimeout(syncRetryTimeoutRef.current);
+    syncRetryTimeoutRef.current = null;
+  }, []);
 
-  const recentAmounts = useMemo(
-    () => getDisplayQuickVoteAmounts(recentAmountsByRecency),
-    [recentAmountsByRecency]
-  );
-  const latestUsedAmount = recentAmountsByRecency.at(-1) ?? null;
-  const uncastPower = activeDrop?.context_profile_context?.max_rating ?? null;
-  const votingLabel = activeDrop
-    ? WAVE_VOTING_LABELS[activeDrop.wave.voting_credit_type]
-    : summaryVotingLabel;
-  const remainingCount = isSummarySuccess
-    ? getMemesQuickVoteRemainingCount({
-        count: summaryCount,
-        floor: queue.length,
-        hiddenCount: hiddenSkippedCount,
-        optimisticVoteCount: unreflectedVoteCount,
-      })
-    : getMemesQuickVoteRemainingCount({
-        count: serverCount,
-        floor: queue.length,
-        hiddenCount: hiddenSkippedCount,
+  const stopActiveSync = useCallback(() => {
+    syncRequestIdRef.current += 1;
+    syncAbortControllerRef.current?.abort();
+    syncAbortControllerRef.current = null;
+    clearSyncRetryTimeout();
+  }, [clearSyncRetryTimeout]);
+
+  const syncUndiscoveredWindow = useCallback(async () => {
+    if (!enabled) {
+      return;
+    }
+
+    if (isSettingsLoaded && !isQuickVoteEnabled) {
+      setCurrentSessionState({
+        ...createInitialSessionState(),
+        isExhausted: true,
       });
-  const hasDiscoveryError = enabled && hasPageFetchError;
-  const isQuickVoteUnavailable =
-    enabled && isSettingsLoaded && !isSummaryQuickVoteEnabled;
-  const activeProfileContext = clampedActiveDrop?.context_profile_context;
-  const isPowerExhausted =
-    enabled &&
-    !hasDiscoveryError &&
-    activeProfileContext?.rating === 0 &&
-    typeof activeProfileContext.max_rating === "number" &&
-    activeProfileContext.max_rating <= 0;
-  const isExhausted =
-    enabled &&
-    (isQuickVoteUnavailable || isDiscoveryExhausted || isPowerExhausted);
-  const isLoading =
-    enabled &&
-    !hasDiscoveryError &&
-    !isExhausted &&
-    !activeDropCandidate &&
-    (!isSettingsLoaded ||
-      (isSummaryQuickVoteEnabled && isSummaryPending) ||
-      isFetchingPage ||
-      activeIsLoading);
+      return;
+    }
+
+    if (!isQuickVoteEnabled || !contextProfile || waveId === null) {
+      return;
+    }
+
+    const requestId = syncRequestIdRef.current + 1;
+    syncRequestIdRef.current = requestId;
+    syncAbortControllerRef.current?.abort();
+    const abortController = new AbortController();
+    syncAbortControllerRef.current = abortController;
+
+    setCurrentSessionState((current) => ({
+      ...current,
+      hasDiscoveryError: false,
+      isExhausted: false,
+      isLoading: current.currentDrop === null,
+    }));
+
+    try {
+      const responses = await Promise.all(
+        Array.from({ length: MEMES_QUICK_VOTE_LOOKAHEAD_COUNT }, (_, skip) =>
+          fetchMemesQuickVoteUndiscoveredDrop({
+            signal: abortController.signal,
+            skip,
+            waveId,
+          })
+        )
+      );
+
+      if (
+        abortController.signal.aborted ||
+        syncRequestIdRef.current !== requestId
+      ) {
+        return;
+      }
+
+      const primaryDrop = responses[0]?.drop ?? null;
+      const rawTotalCount =
+        responses.find((response) => typeof response.total_count === "number")
+          ?.total_count ?? 0;
+      const fetchedDrops = getUniqueDrops(
+        responses.flatMap((response) => (response.drop ? [response.drop] : []))
+      );
+
+      setCurrentSessionState((current) =>
+        applyFetchedWindowState({
+          current,
+          fetchedDrops,
+          pendingDropIds: pendingDropIdsRef.current,
+          primaryDrop,
+          rawTotalCount,
+        })
+      );
+    } catch {
+      if (
+        abortController.signal.aborted ||
+        syncRequestIdRef.current !== requestId
+      ) {
+        return;
+      }
+
+      setCurrentSessionState((current) =>
+        current.currentDrop
+          ? {
+              ...current,
+              isLoading: false,
+            }
+          : {
+              ...current,
+              hasDiscoveryError: true,
+              isExhausted: false,
+              isLoading: false,
+            }
+      );
+    }
+  }, [
+    contextProfile,
+    enabled,
+    isQuickVoteEnabled,
+    isSettingsLoaded,
+    pendingDropIdsRef,
+    setCurrentSessionState,
+    waveId,
+  ]);
 
   return {
-    activeDrop,
-    hasDiscoveryError,
-    isExhausted,
-    isLoading,
-    isReady: activeDrop !== null,
-    latestUsedAmount,
-    queue,
-    recentAmounts,
-    remainingCount,
-    uncastPower,
-    votingLabel,
+    clearSyncRetryTimeout,
+    stopActiveSync,
+    syncUndiscoveredWindow,
   };
 };
 
-const useMemesQuickVoteQueueActions = ({
-  activeCandidateId,
-  discoveredDropsById,
+const useMemesQuickVoteSessionEffects = ({
+  contextProfile,
+  currentSessionState,
   enabled,
-  hideDropId,
-  invalidateDrops,
   isQuickVoteEnabled,
-  isSummarySuccess,
-  nextCandidateId,
-  optimisticRemainingPowerKey,
-  optimisticRemainingPowerState,
-  refetchSummary,
-  removeDropId,
-  requestAuth,
-  resyncDiscovery,
-  setAndPersistRecentAmounts,
-  setAndPersistSkippedDropIds,
-  setOptimisticRemainingPowerState,
-  setToast,
-  summaryCount,
-}: UseMemesQuickVoteQueueActionsOptions) => {
-  const {
-    hasPendingOptimisticVotes,
-    optimisticRemainingPower,
-    summaryOptimismState,
-  } = useMemesQuickVoteOptimisticState({
-    isSummarySuccess,
-    optimisticRemainingPowerKey,
-    optimisticRemainingPowerState,
-    summaryCount,
-  });
-  const {
-    handleInvalidatedDrop,
-    handleVoteFailure,
-    handleVoteQueued,
-    handleVoteSuccess,
-  } = useMemesQuickVoteVoteHandlers({
-    isSummarySuccess,
-    optimisticRemainingPowerKey,
-    refetchSummary,
-    removeDropId,
-    resyncDiscovery,
-    setAndPersistSkippedDropIds,
-    setOptimisticRemainingPowerState,
-    summaryCount,
-  });
-  const active = useMemesQuickVoteActiveDrop({
-    activeCandidateId,
-    discoveredDropsById,
-    enabled: enabled && isQuickVoteEnabled,
-    nextCandidateId,
-    onInvalidatedDrop: handleInvalidatedDrop,
-  });
-  const effectiveOptimisticRemainingPower =
-    active.hasFreshData && !hasPendingOptimisticVotes
-      ? null
-      : optimisticRemainingPower;
-  const { isVoting, submitVote } = useMemesQuickVoteSubmit({
-    requestAuth,
-    setToast,
-    invalidateDrops,
-    onVoteFailure: handleVoteFailure,
-    onVoteQueued: handleVoteQueued,
-    onVoteSuccess: handleVoteSuccess,
-    setAndPersistRecentAmounts,
-    setAndPersistSkippedDropIds,
+  pendingDropIdsRef,
+  stateKey,
+  stopActiveSync,
+  syncUndiscoveredWindow,
+  waveId,
+}: {
+  readonly contextProfile: string | null | undefined;
+  readonly currentSessionState: MemesQuickVoteSessionState;
+  readonly enabled: boolean;
+  readonly isQuickVoteEnabled: boolean;
+  readonly pendingDropIdsRef: { current: readonly string[] };
+  readonly stateKey: string;
+  readonly stopActiveSync: () => void;
+  readonly syncUndiscoveredWindow: () => Promise<void>;
+  readonly waveId: string | null;
+}) => {
+  useEffect(() => {
+    stopActiveSync();
+
+    if (!enabled || !isQuickVoteEnabled || !contextProfile || waveId === null) {
+      return;
+    }
+
+    const timeoutId = globalThis.setTimeout(() => {
+      runBestEffortSync(syncUndiscoveredWindow);
+    }, 0);
+
+    return () => {
+      globalThis.clearTimeout(timeoutId);
+      stopActiveSync();
+    };
+  }, [
+    contextProfile,
+    enabled,
+    isQuickVoteEnabled,
+    stateKey,
+    stopActiveSync,
+    syncUndiscoveredWindow,
+    waveId,
+  ]);
+
+  useEffect(() => {
+    if (
+      !enabled ||
+      currentSessionState.isLoading ||
+      currentSessionState.hasDiscoveryError ||
+      currentSessionState.isExhausted
+    ) {
+      return;
+    }
+
+    const shouldContinueSync =
+      currentSessionState.recentlyHandledDropIds.length > 0 ||
+      (pendingDropIdsRef.current.length > 0 &&
+        currentSessionState.currentDrop === null);
+
+    if (!shouldContinueSync) {
+      return;
+    }
+
+    const timeoutId = globalThis.setTimeout(() => {
+      runBestEffortSync(syncUndiscoveredWindow);
+    }, 300);
+
+    return () => {
+      globalThis.clearTimeout(timeoutId);
+    };
+  }, [
+    currentSessionState.currentDrop,
+    currentSessionState.hasDiscoveryError,
+    currentSessionState.isExhausted,
+    currentSessionState.isLoading,
+    currentSessionState.recentlyHandledDropIds.length,
+    enabled,
+    pendingDropIdsRef,
+    syncUndiscoveredWindow,
+  ]);
+
+  useEffect(
+    () => () => {
+      stopActiveSync();
+    },
+    [stopActiveSync]
+  );
+};
+
+const useMemesQuickVoteSessionState = ({
+  contextProfile,
+  enabled,
+  isQuickVoteEnabled,
+  isSettingsLoaded,
+  pendingDropIdsRef,
+  stateKey,
+  waveId,
+}: UseMemesQuickVoteSessionStateOptions): UseMemesQuickVoteSessionStateResult => {
+  const { currentSessionState, setCurrentSessionState } =
+    useKeyedMemesQuickVoteSessionStore(stateKey);
+  const { stopActiveSync, syncUndiscoveredWindow } =
+    useMemesQuickVoteWindowSync({
+      contextProfile,
+      enabled,
+      isQuickVoteEnabled,
+      isSettingsLoaded,
+      pendingDropIdsRef,
+      setCurrentSessionState,
+      waveId,
+    });
+
+  useMemesQuickVoteSessionEffects({
+    contextProfile,
+    currentSessionState,
+    enabled,
+    isQuickVoteEnabled,
+    pendingDropIdsRef,
+    stateKey,
+    stopActiveSync,
+    syncUndiscoveredWindow,
+    waveId,
   });
-  const skipDrop = useCallback(
+
+  const advanceVisibleDrop = useCallback(
+    (drop: ExtendedDrop) => {
+      setCurrentSessionState((current) =>
+        applyOptimisticAdvanceState({
+          current,
+          dropId: drop.id,
+          pendingDropIds: pendingDropIdsRef.current,
+        })
+      );
+      runBestEffortSync(syncUndiscoveredWindow);
+    },
+    [pendingDropIdsRef, setCurrentSessionState, syncUndiscoveredWindow]
+  );
+
+  const restoreFailedDrop = useCallback(
     (drop: ExtendedDrop) => {
-      hideDropId(drop.id);
-      setAndPersistSkippedDropIds((current) =>
-        appendSkippedDropId(current, drop.id)
+      setCurrentSessionState((current) =>
+        applyFailedDropRestoreState({
+          current,
+          failedDrop: drop,
+        })
       );
+      runBestEffortSync(syncUndiscoveredWindow);
     },
-    [hideDropId, setAndPersistSkippedDropIds]
+    [setCurrentSessionState, syncUndiscoveredWindow]
   );
 
   return {
-    active,
-    effectiveOptimisticRemainingPower,
-    isVoting,
-    skipDrop,
-    submitVote,
-    summaryOptimismState,
+    advanceVisibleDrop,
+    restoreFailedDrop,
+    sessionState: currentSessionState,
+    syncUndiscoveredWindow,
   };
 };
 
+const useInvalidateQuickVoteUndiscoveredDrop = ({
+  contextProfile,
+  proxyId,
+  queryClient,
+  waveId,
+}: {
+  readonly contextProfile: string | null | undefined;
+  readonly proxyId: string | null | undefined;
+  readonly queryClient: ReturnType<typeof useQueryClient>;
+  readonly waveId: string | null;
+}) =>
+  useCallback(() => {
+    queryClient
+      .invalidateQueries({
+        predicate: (query) => {
+          if (
+            !Array.isArray(query.queryKey) ||
+            query.queryKey[0] !==
+              MEMES_QUICK_VOTE_UNDISCOVERED_DROP_QUERY_KEY ||
+            typeof query.queryKey[1] !== "object" ||
+            query.queryKey[1] === null
+          ) {
+            return false;
+          }
+
+          const undiscoveredQuery = query.queryKey[1] as {
+            readonly context_profile?: string | null;
+            readonly proxyId?: string | null;
+            readonly waveId?: string | null;
+          };
+
+          return (
+            undiscoveredQuery.context_profile === (contextProfile ?? null) &&
+            undiscoveredQuery.proxyId === (proxyId ?? null) &&
+            undiscoveredQuery.waveId === waveId
+          );
+        },
+      })
+      .catch(() => {
+        // Query invalidation is best-effort. The next footer read will recover.
+      });
+  }, [contextProfile, proxyId, queryClient, waveId]);
+
+const useMemesQuickVoteQueueSubmission = ({
+  invalidateQuickVoteUndiscoveredDrop,
+  requestAuth,
+  session,
+  setAndPersistRecentAmounts,
+  setOptimisticRemainingPowerState,
+  setToast,
+  stateKey,
+}: {
+  readonly invalidateQuickVoteUndiscoveredDrop: () => void;
+  readonly requestAuth: ContextType<typeof AuthContext>["requestAuth"];
+  readonly session: UseMemesQuickVoteSessionStateResult;
+  readonly setAndPersistRecentAmounts: (
+    updater: (current: number[]) => number[]
+  ) => void;
+  readonly setOptimisticRemainingPowerState: Dispatch<
+    SetStateAction<KeyedOptimisticRemainingPowerState>
+  >;
+  readonly setToast: ContextType<typeof AuthContext>["setToast"];
+  readonly stateKey: string;
+}) =>
+  useMemesQuickVoteSubmit({
+    onRatingFailure: (drop, amount, type) => {
+      session.restoreFailedDrop(drop);
+
+      if (type === "vote") {
+        setOptimisticRemainingPowerState((current) =>
+          restoreOptimisticRemainingPower({
+            amount,
+            current: getCurrentOptimisticRemainingPowerState({
+              key: stateKey,
+              state: current,
+            }),
+            maxRating: drop.context_profile_context?.max_rating ?? 0,
+          })
+        );
+      }
+
+      invalidateQuickVoteUndiscoveredDrop();
+    },
+    onRatingQueued: (drop, amount, type) => {
+      session.advanceVisibleDrop(drop);
+
+      if (type === "vote") {
+        setOptimisticRemainingPowerState((current) =>
+          reduceOptimisticRemainingPower({
+            amount,
+            current: getCurrentOptimisticRemainingPowerState({
+              key: stateKey,
+              state: current,
+            }),
+            maxRating: drop.context_profile_context?.max_rating ?? 0,
+          })
+        );
+      }
+    },
+    onRatingSuccess: (_drop, _amount, nextRemainingPower, type) => {
+      if (type === "vote") {
+        setOptimisticRemainingPowerState((current) =>
+          reconcileOptimisticRemainingPower({
+            current: getCurrentOptimisticRemainingPowerState({
+              key: stateKey,
+              state: current,
+            }),
+            nextRemainingPower,
+          })
+        );
+      }
+
+      invalidateQuickVoteUndiscoveredDrop();
+      runBestEffortSync(session.syncUndiscoveredWindow);
+    },
+    requestAuth,
+    setAndPersistRecentAmounts,
+    setToast,
+  });
+
 export const useMemesQuickVoteQueue = ({
   enabled = true,
   sessionId,
 }: UseMemesQuickVoteQueueOptions): UseMemesQuickVoteQueueResult => {
   const { requestAuth, setToast } = useContext(AuthContext);
-  const { invalidateDrops } = useContext(ReactQueryWrapperContext);
+  const queryClient = useQueryClient();
   const {
     contextProfile,
-    isLoaded: isSettingsLoaded,
     isEnabled: isQuickVoteEnabled,
+    isLoaded: isSettingsLoaded,
     memesWaveId,
     proxyId,
   } = useMemesQuickVoteContext();
-  const optimisticRemainingPowerKey = getOptimisticRemainingPowerKey({
-    contextProfile,
-    memesWaveId,
-    sessionId,
-  });
+  const waveId =
+    typeof memesWaveId === "string" && memesWaveId.length > 0
+      ? memesWaveId
+      : null;
+  const stateKey = `${sessionId}:${waveId ?? ""}:${contextProfile ?? ""}`;
   const [optimisticRemainingPowerState, setOptimisticRemainingPowerState] =
-    useState<OptimisticRemainingPowerState>(() =>
-      createInitialOptimisticRemainingPowerState(optimisticRemainingPowerKey)
+    useState<KeyedOptimisticRemainingPowerState>(() =>
+      createInitialOptimisticRemainingPowerState(stateKey)
     );
-  const {
-    recentAmountsByRecency,
-    setAndPersistRecentAmounts,
-    setAndPersistSkippedDropIds,
-    skippedDropIds,
-  } = useMemesQuickVoteStorage({
+  const { recentAmountsByRecency, setAndPersistRecentAmounts } =
+    useMemesQuickVoteStorage({
+      contextProfile,
+      memesWaveId,
+    });
+  const pendingDropIdsRef = useRef<readonly string[]>([]);
+  const session = useMemesQuickVoteSessionState({
     contextProfile,
-    memesWaveId,
-    proxyId,
-  });
-  const summary = useMemesQuickVoteSummary({ enabled });
-  const discovery = useMemesQuickVoteDiscovery({
     enabled,
-    sessionId,
-    skippedDropIds,
-  });
-  const {
-    activeCandidateId,
-    discoveredDropsById,
-    hasPageFetchError,
-    hideDropId,
-    isExhausted: isDiscoveryExhausted,
-    isFetchingPage,
-    nextCandidateId,
-    queue: discoveredQueue,
-    removeDropId,
-    resyncDiscovery,
-    retryDiscovery,
-    serverCount,
-  } = discovery;
-  const {
-    count: summaryCount,
-    firstDrop: summaryFirstDrop,
-    isPending: isSummaryPending,
-    isQuickVoteEnabled: isSummaryQuickVoteEnabled,
-    isSuccess: isSummarySuccess,
-    refetch: refetchSummary,
-    stats: summaryStats,
-  } = summary;
-  const {
-    active,
-    effectiveOptimisticRemainingPower,
-    isVoting,
-    skipDrop,
-    submitVote,
-    summaryOptimismState,
-  } = useMemesQuickVoteQueueActions({
-    activeCandidateId,
-    discoveredDropsById,
-    enabled,
-    hideDropId,
-    invalidateDrops,
     isQuickVoteEnabled,
-    isSummarySuccess,
-    nextCandidateId,
-    optimisticRemainingPowerKey,
-    optimisticRemainingPowerState,
-    refetchSummary,
-    removeDropId,
-    requestAuth,
-    resyncDiscovery,
-    setAndPersistRecentAmounts,
-    setAndPersistSkippedDropIds,
-    setOptimisticRemainingPowerState,
-    setToast,
-    summaryCount,
-  });
-  const clearHiddenSummaryDrop = useCallback(
-    (dropId: string) => {
-      removeDropId(dropId);
-      setAndPersistSkippedDropIds((current) =>
-        current.filter((value) => value !== dropId)
-      );
-      void refetchSummary();
-    },
-    [refetchSummary, removeDropId, setAndPersistSkippedDropIds]
-  );
-  useMemesQuickVoteHiddenSummaryCleanup({
-    activeCandidateId,
-    enabled,
-    isFetchingPage,
-    isSummarySuccess,
-    memesWaveId,
-    onClearHiddenSummaryDrop: clearHiddenSummaryDrop,
-    skippedDropIds,
-    summaryFirstDrop,
-  });
-
-  const derivedState = useDerivedMemesQuickVoteQueueState({
-    activeDropCandidate: active.activeDrop,
-    activeIsLoading: active.isLoading,
-    discoveredQueue,
-    effectiveOptimisticRemainingPower,
-    enabled,
-    hasPageFetchError,
-    hiddenSkippedCount: skippedDropIds.length,
-    isDiscoveryExhausted,
-    isFetchingPage,
     isSettingsLoaded,
-    isSummaryPending,
-    isSummaryQuickVoteEnabled,
-    isSummarySuccess,
-    recentAmountsByRecency,
-    serverCount,
-    summaryCount,
-    unreflectedVoteCount: summaryOptimismState.unreflectedVoteCount,
-    summaryVotingLabel: summaryStats.votingLabel,
+    pendingDropIdsRef,
+    stateKey,
+    waveId,
   });
+  const invalidateQuickVoteUndiscoveredDrop =
+    useInvalidateQuickVoteUndiscoveredDrop({
+      contextProfile,
+      proxyId,
+      queryClient,
+      waveId,
+    });
+  const { pendingDropIds, submitSkip, submitVote } =
+    useMemesQuickVoteQueueSubmission({
+      invalidateQuickVoteUndiscoveredDrop,
+      requestAuth,
+      session,
+      setAndPersistRecentAmounts,
+      setOptimisticRemainingPowerState,
+      setToast,
+      stateKey,
+    });
+
+  useEffect(() => {
+    pendingDropIdsRef.current = pendingDropIds;
+  }, [pendingDropIds]);
+
+  const activeApiDrop = session.sessionState.currentDrop;
+  const effectiveOptimisticRemainingPower =
+    getEffectiveOptimisticRemainingPower({
+      activeApiDrop,
+      state: getCurrentOptimisticRemainingPowerState({
+        key: stateKey,
+        state: optimisticRemainingPowerState,
+      }),
+    });
+  const activeDropCandidate = useMemo(() => {
+    if (!activeApiDrop) {
+      return null;
+    }
+
+    return clampDropMaxRating(
+      convertApiDropToExtendedDrop(activeApiDrop),
+      effectiveOptimisticRemainingPower
+    );
+  }, [activeApiDrop, effectiveOptimisticRemainingPower]);
+  const activeDrop = isMemesQuickVoteVoteableDrop(activeDropCandidate)
+    ? activeDropCandidate
+    : null;
+  const latestUsedAmount = recentAmountsByRecency.at(-1) ?? null;
+  const recentAmounts = getDisplayQuickVoteAmounts(recentAmountsByRecency);
 
   return {
-    ...derivedState,
-    isVoting,
-    retryDiscovery,
+    activeDrop,
+    hasDiscoveryError: session.sessionState.hasDiscoveryError,
+    isExhausted: session.sessionState.isExhausted,
+    isLoading: session.sessionState.isLoading && activeDrop === null,
+    isReady: activeDrop !== null,
+    latestUsedAmount,
+    recentAmounts,
+    remainingCount: session.sessionState.totalCount,
+    retryDiscovery: () => {
+      runBestEffortSync(session.syncUndiscoveredWindow);
+    },
+    skipDrop: submitSkip,
     submitVote,
-    skipDrop,
+    uncastPower: activeDrop?.context_profile_context?.max_rating ?? null,
+    votingLabel: activeDrop
+      ? WAVE_VOTING_LABELS[activeDrop.wave.voting_credit_type]
+      : null,
   };
 };
diff --git a/hooks/useMemesQuickVoteStorage.ts b/hooks/useMemesQuickVoteStorage.ts
index 1c7ced8e0e..8e0415a140 100644
--- a/hooks/useMemesQuickVoteStorage.ts
+++ b/hooks/useMemesQuickVoteStorage.ts
@@ -1,49 +1,27 @@
 "use client";
 
-import type { ApiDrop } from "@/generated/models/ApiDrop";
-import { isMemesQuickVoteMissingDropError } from "@/hooks/memesQuickVote.errors";
-import {
-  isMemesQuickVoteDiscoverableDrop,
-  sanitizeStoredAmounts,
-  sanitizeStoredDropIds,
-} from "@/hooks/memesQuickVote.helpers";
-import { getMemesQuickVoteDropQueryKey } from "@/hooks/memesQuickVote.query";
+import { sanitizeStoredAmounts } from "@/hooks/memesQuickVote.helpers";
 import {
   readStoredNumberArray,
-  readStoredStringArray,
   useStoredNumberArray,
-  useStoredStringArray,
   writeStoredNumberArray,
-  writeStoredStringArray,
 } from "@/hooks/memesQuickVote.storageStore";
-import { useQueryClient } from "@tanstack/react-query";
-import { useCallback, useMemo } from "react";
+import { useCallback } from "react";
 
-const SKIPPED_STORAGE_PREFIX = "memesQuickVoteSkipped";
 const AMOUNTS_STORAGE_PREFIX = "memesQuickVoteAmounts";
 
 type UseMemesQuickVoteStorageOptions = {
   readonly contextProfile: string | null | undefined;
   readonly memesWaveId: string | null | undefined;
-  readonly proxyId?: string | null | undefined;
 };
 
 type UseMemesQuickVoteStorageResult = {
-  readonly skippedDropIds: string[];
   readonly recentAmountsByRecency: number[];
   readonly setAndPersistRecentAmounts: (
     updater: (current: number[]) => number[]
   ) => void;
-  readonly setAndPersistSkippedDropIds: (
-    updater: (current: string[]) => string[]
-  ) => void;
 };
 
-type UseMemesQuickVoteSkippedDropIdsResult = Pick<
-  UseMemesQuickVoteStorageResult,
-  "setAndPersistSkippedDropIds" | "skippedDropIds"
->;
-
 const getStorageKey = (
   prefix: string,
   memesWaveId: string | null | undefined,
@@ -63,121 +41,15 @@ const areNumberArraysEqual = (
   left.length === right.length &&
   left.every((value, index) => value === right[index]);
 
-const areStringArraysEqual = (
-  left: readonly string[],
-  right: readonly string[]
-): boolean =>
-  left.length === right.length &&
-  left.every((value, index) => value === right[index]);
-
-const getEffectiveMemesQuickVoteSkippedDropIds = ({
-  contextProfile,
-  memesWaveId,
-  proxyId,
-  queryClient,
-  skippedDropIds,
-}: {
-  readonly contextProfile: string | null | undefined;
-  readonly memesWaveId: string | null | undefined;
-  readonly proxyId: string | null | undefined;
-  readonly queryClient: ReturnType<typeof useQueryClient>;
-  readonly skippedDropIds: readonly string[];
-}): string[] =>
-  skippedDropIds.filter((dropId) => {
-    const queryKey = getMemesQuickVoteDropQueryKey({
-      contextProfile,
-      dropId,
-      proxyId,
-    });
-    const cachedDrop = queryClient.getQueryData<ApiDrop>(queryKey);
-
-    if (cachedDrop !== undefined) {
-      return isMemesQuickVoteDiscoverableDrop({
-        drop: cachedDrop,
-        waveId: memesWaveId,
-      });
-    }
-
-    const queryState = queryClient.getQueryState(queryKey);
-
-    if (queryState?.status !== "error") {
-      return true;
-    }
-
-    return !isMemesQuickVoteMissingDropError(queryState.error);
-  });
-
-export const useMemesQuickVoteSkippedDropIds = ({
-  contextProfile,
-  memesWaveId,
-  proxyId,
-}: UseMemesQuickVoteStorageOptions): UseMemesQuickVoteSkippedDropIdsResult => {
-  const queryClient = useQueryClient();
-  const skippedStorageKey = getStorageKey(
-    SKIPPED_STORAGE_PREFIX,
-    memesWaveId,
-    contextProfile
-  );
-  const storedSkippedDropIds = useStoredStringArray(
-    skippedStorageKey,
-    sanitizeStoredDropIds
-  );
-  const setAndPersistSkippedDropIds = useCallback(
-    (updater: (current: string[]) => string[]) => {
-      const storedCurrent = readStoredStringArray(
-        skippedStorageKey,
-        sanitizeStoredDropIds
-      );
-      const current = getEffectiveMemesQuickVoteSkippedDropIds({
-        contextProfile,
-        memesWaveId,
-        proxyId,
-        queryClient,
-        skippedDropIds: storedCurrent,
-      });
-      const next = sanitizeStoredDropIds(updater([...current]));
-
-      if (areStringArraysEqual(storedCurrent, next)) {
-        return;
-      }
-
-      writeStoredStringArray(skippedStorageKey, next);
-    },
-    [contextProfile, memesWaveId, proxyId, queryClient, skippedStorageKey]
-  );
-  const skippedDropIds = useMemo(
-    () =>
-      getEffectiveMemesQuickVoteSkippedDropIds({
-        contextProfile,
-        memesWaveId,
-        proxyId,
-        queryClient,
-        skippedDropIds: storedSkippedDropIds,
-      }),
-    [contextProfile, memesWaveId, proxyId, queryClient, storedSkippedDropIds]
-  );
-  return {
-    setAndPersistSkippedDropIds,
-    skippedDropIds,
-  };
-};
-
 export const useMemesQuickVoteStorage = ({
   contextProfile,
   memesWaveId,
-  proxyId,
 }: UseMemesQuickVoteStorageOptions): UseMemesQuickVoteStorageResult => {
   const amountsStorageKey = getStorageKey(
     AMOUNTS_STORAGE_PREFIX,
     memesWaveId,
     contextProfile
   );
-  const { setAndPersistSkippedDropIds, skippedDropIds } =
-    useMemesQuickVoteSkippedDropIds({
-      contextProfile,
-      memesWaveId,
-      proxyId,
-    });
   const recentAmountsByRecency = useStoredNumberArray(
     amountsStorageKey,
     sanitizeStoredAmounts
@@ -201,9 +73,7 @@ export const useMemesQuickVoteStorage = ({
   );
 
   return {
-    skippedDropIds,
     recentAmountsByRecency,
     setAndPersistRecentAmounts,
-    setAndPersistSkippedDropIds,
   };
 };
diff --git a/hooks/useMemesQuickVoteSubmit.ts b/hooks/useMemesQuickVoteSubmit.ts
index 6cf490e626..2d1e367a60 100644
--- a/hooks/useMemesQuickVoteSubmit.ts
+++ b/hooks/useMemesQuickVoteSubmit.ts
@@ -9,7 +9,8 @@ import {
 } from "@/hooks/memesQuickVote.helpers";
 import { commonApiPost } from "@/services/api/common-api";
 import { useMutation } from "@tanstack/react-query";
-import type { ReactNode } from "react";
+import type { UseMutationResult } from "@tanstack/react-query";
+import type { Dispatch, ReactNode, SetStateAction } from "react";
 import { useCallback, useRef, useState } from "react";
 import type { TypeOptions } from "react-toastify";
 
@@ -21,54 +22,250 @@ type SetToast = (options: {
 }) => void;
 
 type PersistNumberArray = (updater: (current: number[]) => number[]) => void;
-type PersistStringArray = (updater: (current: string[]) => string[]) => void;
 
-type QueuedVote = {
+type QueuedRating = {
   readonly amount: number;
   readonly currentRating: number;
   readonly drop: ExtendedDrop;
   readonly maxRating: number;
+  readonly type: "skip" | "vote";
 };
 
 type UseMemesQuickVoteSubmitOptions = {
   readonly requestAuth: () => Promise<{ success: boolean }>;
   readonly setToast: SetToast;
-  readonly invalidateDrops: () => void;
   readonly setAndPersistRecentAmounts: PersistNumberArray;
-  readonly setAndPersistSkippedDropIds: PersistStringArray;
-  readonly onVoteFailure: (drop: ExtendedDrop, amount: number) => void;
-  readonly onVoteQueued: (drop: ExtendedDrop, amount: number) => void;
-  readonly onVoteSuccess: (
+  readonly onRatingFailure: (
     drop: ExtendedDrop,
     amount: number,
-    nextRemainingPower: number
+    type: QueuedRating["type"]
+  ) => void;
+  readonly onRatingQueued: (
+    drop: ExtendedDrop,
+    amount: number,
+    type: QueuedRating["type"]
+  ) => void;
+  readonly onRatingSuccess: (
+    drop: ExtendedDrop,
+    amount: number,
+    nextRemainingPower: number,
+    type: QueuedRating["type"]
   ) => void;
 };
 
 type UseMemesQuickVoteSubmitResult = {
   readonly isVoting: boolean;
+  readonly pendingDropIds: readonly string[];
+  readonly submitSkip: (drop: ExtendedDrop) => Promise<boolean>;
   readonly submitVote: (
     drop: ExtendedDrop,
     amount: number | string
   ) => Promise<boolean>;
 };
 
+type RefValue<T> = {
+  current: T;
+};
+
+const getQueuedRatingAppliedAmount = ({
+  nextRating,
+  queuedRating,
+}: {
+  readonly nextRating: number | undefined;
+  readonly queuedRating: QueuedRating;
+}): number => {
+  if (queuedRating.type === "skip") {
+    return 0;
+  }
+
+  if (typeof nextRating === "number") {
+    return Math.max(0, nextRating - queuedRating.currentRating);
+  }
+
+  return queuedRating.amount;
+};
+
+const getQueuedRatingErrorMessage = ({
+  error,
+  type,
+}: {
+  readonly error: unknown;
+  readonly type: QueuedRating["type"];
+}): string => {
+  if (error instanceof Error) {
+    return error.message;
+  }
+
+  return type === "skip"
+    ? "Quick vote couldn't skip that meme."
+    : "Quick vote couldn't submit that vote.";
+};
+
+const flushMemesQuickVoteRatings = async ({
+  isFlushingRef,
+  onRatingFailure,
+  onRatingSuccess,
+  queuedDropIdsRef,
+  ratingMutation,
+  ratingQueueRef,
+  requestAuth,
+  setPendingDropIds,
+  setPendingRatingCount,
+  setToast,
+}: {
+  readonly isFlushingRef: RefValue<boolean>;
+  readonly onRatingFailure: UseMemesQuickVoteSubmitOptions["onRatingFailure"];
+  readonly onRatingSuccess: UseMemesQuickVoteSubmitOptions["onRatingSuccess"];
+  readonly queuedDropIdsRef: RefValue<Set<string>>;
+  readonly ratingMutation: UseMutationResult<
+    ApiDrop,
+    Error,
+    {
+      readonly amount: number;
+      readonly dropId: string;
+    }
+  >;
+  readonly ratingQueueRef: RefValue<QueuedRating[]>;
+  readonly requestAuth: UseMemesQuickVoteSubmitOptions["requestAuth"];
+  readonly setPendingDropIds: Dispatch<SetStateAction<string[]>>;
+  readonly setPendingRatingCount: Dispatch<SetStateAction<number>>;
+  readonly setToast: SetToast;
+}) => {
+  if (isFlushingRef.current) {
+    return;
+  }
+
+  isFlushingRef.current = true;
+
+  try {
+    while (ratingQueueRef.current.length > 0) {
+      const queuedRating = ratingQueueRef.current[0];
+
+      if (!queuedRating) {
+        break;
+      }
+
+      try {
+        const { success } = await requestAuth();
+
+        if (!success) {
+          throw new Error("Quick vote couldn't verify your session.");
+        }
+
+        const response = await ratingMutation.mutateAsync({
+          amount: queuedRating.amount,
+          dropId: queuedRating.drop.id,
+        });
+        const appliedAmount = getQueuedRatingAppliedAmount({
+          nextRating: response.context_profile_context?.rating,
+          queuedRating,
+        });
+        const nextRemainingPower = Math.max(
+          0,
+          queuedRating.maxRating - appliedAmount
+        );
+
+        onRatingSuccess(
+          queuedRating.drop,
+          queuedRating.amount,
+          nextRemainingPower,
+          queuedRating.type
+        );
+      } catch (error) {
+        setToast({
+          message: getQueuedRatingErrorMessage({
+            error,
+            type: queuedRating.type,
+          }),
+          type: "error",
+        });
+        onRatingFailure(
+          queuedRating.drop,
+          queuedRating.amount,
+          queuedRating.type
+        );
+      } finally {
+        ratingQueueRef.current.shift();
+        queuedDropIdsRef.current.delete(queuedRating.drop.id);
+        setPendingDropIds((current) =>
+          current.filter((dropId) => dropId !== queuedRating.drop.id)
+        );
+        setPendingRatingCount(ratingQueueRef.current.length);
+      }
+    }
+  } finally {
+    isFlushingRef.current = false;
+  }
+};
+
+const queueMemesQuickVoteRating = ({
+  amount,
+  drop,
+  flushQueuedRatings,
+  onRatingQueued,
+  queuedDropIdsRef,
+  ratingQueueRef,
+  setAndPersistRecentAmounts,
+  setPendingDropIds,
+  setPendingRatingCount,
+  type,
+}: {
+  readonly amount: number;
+  readonly drop: ExtendedDrop;
+  readonly flushQueuedRatings: () => void;
+  readonly onRatingQueued: UseMemesQuickVoteSubmitOptions["onRatingQueued"];
+  readonly queuedDropIdsRef: RefValue<Set<string>>;
+  readonly ratingQueueRef: RefValue<QueuedRating[]>;
+  readonly setAndPersistRecentAmounts: PersistNumberArray;
+  readonly setPendingDropIds: Dispatch<SetStateAction<string[]>>;
+  readonly setPendingRatingCount: Dispatch<SetStateAction<number>>;
+  readonly type: QueuedRating["type"];
+}): boolean => {
+  if (queuedDropIdsRef.current.has(drop.id)) {
+    return false;
+  }
+
+  ratingQueueRef.current.push({
+    amount,
+    currentRating: drop.context_profile_context?.rating ?? 0,
+    drop,
+    maxRating: drop.context_profile_context?.max_rating ?? 0,
+    type,
+  });
+  queuedDropIdsRef.current.add(drop.id);
+  setPendingDropIds((current) =>
+    current.includes(drop.id) ? current : [...current, drop.id]
+  );
+  setPendingRatingCount(ratingQueueRef.current.length);
+
+  onRatingQueued(drop, amount, type);
+
+  if (type === "vote") {
+    setAndPersistRecentAmounts((current) =>
+      addRecentQuickVoteAmount(current, amount)
+    );
+  }
+
+  flushQueuedRatings();
+
+  return true;
+};
+
 export const useMemesQuickVoteSubmit = ({
   requestAuth,
   setToast,
-  invalidateDrops,
   setAndPersistRecentAmounts,
-  setAndPersistSkippedDropIds,
-  onVoteFailure,
-  onVoteQueued,
-  onVoteSuccess,
+  onRatingFailure,
+  onRatingQueued,
+  onRatingSuccess,
 }: UseMemesQuickVoteSubmitOptions): UseMemesQuickVoteSubmitResult => {
-  const voteQueueRef = useRef<QueuedVote[]>([]);
+  const ratingQueueRef = useRef<QueuedRating[]>([]);
   const queuedDropIdsRef = useRef<Set<string>>(new Set());
   const isFlushingRef = useRef(false);
-  const [pendingVoteCount, setPendingVoteCount] = useState(0);
+  const [pendingDropIds, setPendingDropIds] = useState<string[]>([]);
+  const [pendingRatingCount, setPendingRatingCount] = useState(0);
 
-  const voteMutation = useMutation({
+  const ratingMutation = useMutation({
     mutationFn: ({
       dropId,
       amount,
@@ -85,111 +282,94 @@ export const useMemesQuickVoteSubmit = ({
       }),
   });
 
-  const flushQueuedVotes = useCallback(async () => {
-    if (isFlushingRef.current) {
-      return;
-    }
-
-    isFlushingRef.current = true;
-
-    try {
-      while (voteQueueRef.current.length > 0) {
-        const queuedVote = voteQueueRef.current[0];
-        if (!queuedVote) {
-          break;
-        }
-
-        try {
-          const { success } = await requestAuth();
-
-          if (!success) {
-            throw new Error("Quick vote couldn't verify your session.");
-          }
-
-          const response = await voteMutation.mutateAsync({
-            dropId: queuedVote.drop.id,
-            amount: queuedVote.amount,
-          });
-          const nextRating = response.context_profile_context?.rating;
-          const appliedAmount =
-            typeof nextRating === "number"
-              ? Math.max(0, nextRating - queuedVote.currentRating)
-              : queuedVote.amount;
-          const nextRemainingPower = Math.max(
-            0,
-            queuedVote.maxRating - appliedAmount
-          );
-
-          onVoteSuccess(queuedVote.drop, queuedVote.amount, nextRemainingPower);
-          invalidateDrops();
-        } catch (error) {
-          setToast({
-            message:
-              error instanceof Error
-                ? error.message
-                : "Quick vote couldn't submit that vote.",
-            type: "error",
-          });
-          onVoteFailure(queuedVote.drop, queuedVote.amount);
-        } finally {
-          voteQueueRef.current.shift();
-          queuedDropIdsRef.current.delete(queuedVote.drop.id);
-          setPendingVoteCount(voteQueueRef.current.length);
-        }
-      }
-    } finally {
-      isFlushingRef.current = false;
-    }
+  const flushQueuedRatings = useCallback(() => {
+    void flushMemesQuickVoteRatings({
+      isFlushingRef,
+      onRatingFailure,
+      onRatingSuccess,
+      queuedDropIdsRef,
+      ratingMutation,
+      ratingQueueRef,
+      requestAuth,
+      setPendingDropIds,
+      setPendingRatingCount,
+      setToast,
+    });
   }, [
-    invalidateDrops,
-    onVoteFailure,
-    onVoteSuccess,
+    isFlushingRef,
+    onRatingFailure,
+    onRatingSuccess,
+    queuedDropIdsRef,
+    ratingMutation,
+    ratingQueueRef,
     requestAuth,
+    setPendingDropIds,
+    setPendingRatingCount,
     setToast,
-    voteMutation,
   ]);
 
+  const queueRating = useCallback(
+    ({
+      amount,
+      drop,
+      type,
+    }: {
+      readonly amount: number;
+      readonly drop: ExtendedDrop;
+      readonly type: QueuedRating["type"];
+    }): boolean => {
+      return queueMemesQuickVoteRating({
+        amount,
+        drop,
+        flushQueuedRatings,
+        onRatingQueued,
+        queuedDropIdsRef,
+        ratingQueueRef,
+        setAndPersistRecentAmounts,
+        setPendingDropIds,
+        setPendingRatingCount,
+        type,
+      });
+    },
+    [flushQueuedRatings, onRatingQueued, setAndPersistRecentAmounts]
+  );
+
   const submitVote = useCallback(
-    async (drop: ExtendedDrop, amount: number | string) => {
-      const currentRating = drop.context_profile_context?.rating ?? 0;
+    (drop: ExtendedDrop, amount: number | string) => {
       const maxRating = drop.context_profile_context?.max_rating ?? 0;
       const normalizedAmount = normalizeQuickVoteAmount(amount, maxRating);
 
-      if (normalizedAmount === null || queuedDropIdsRef.current.has(drop.id)) {
-        return false;
+      if (normalizedAmount === null) {
+        return Promise.resolve(false);
       }
 
-      queuedDropIdsRef.current.add(drop.id);
-      voteQueueRef.current.push({
-        amount: normalizedAmount,
-        currentRating,
-        drop,
-        maxRating,
-      });
-      setPendingVoteCount(voteQueueRef.current.length);
-
-      onVoteQueued(drop, normalizedAmount);
-      setAndPersistRecentAmounts((current) =>
-        addRecentQuickVoteAmount(current, normalizedAmount)
-      );
-      setAndPersistSkippedDropIds((current) =>
-        current.filter((dropId) => dropId !== drop.id)
+      return Promise.resolve(
+        queueRating({
+          amount: normalizedAmount,
+          drop,
+          type: "vote",
+        })
       );
-
-      void flushQueuedVotes();
-
-      return true;
     },
-    [
-      flushQueuedVotes,
-      onVoteQueued,
-      setAndPersistRecentAmounts,
-      setAndPersistSkippedDropIds,
-    ]
+    [queueRating]
+  );
+
+  const submitSkip = useCallback(
+    (drop: ExtendedDrop) =>
+      Promise.resolve(
+        queueRating({
+          amount: 0,
+          drop,
+          type: "skip",
+        })
+      ),
+    [queueRating]
   );
 
   return {
-    isVoting: pendingVoteCount > 0 || voteMutation.isPending,
+    isVoting: pendingRatingCount > 0 || ratingMutation.isPending,
+    pendingDropIds,
+    submitSkip,
     submitVote,
   };
 };
diff --git a/hooks/useMemesQuickVoteSummary.ts b/hooks/useMemesQuickVoteSummary.ts
deleted file mode 100644
index c942c4cf97..0000000000
--- a/hooks/useMemesQuickVoteSummary.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-"use client";
-
-import { getDefaultQueryRetry } from "@/components/react-query-wrapper/utils/query-utils";
-import {
-  buildMemesQuickVoteApiDrop,
-  deriveMemesQuickVoteStatsFromDrop,
-} from "@/hooks/memesQuickVote.helpers";
-import { useMemesQuickVoteContext } from "@/hooks/useMemesQuickVoteContext";
-import {
-  fetchMemesQuickVoteSummary,
-  getMemesQuickVoteSummaryQueryKey,
-} from "@/hooks/memesQuickVote.query";
-import { useMemo } from "react";
-import { useQuery } from "@tanstack/react-query";
-
-export const useMemesQuickVoteSummary = ({
-  enabled = true,
-}: {
-  readonly enabled?: boolean | undefined;
-} = {}) => {
-  const { contextProfile, isEnabled, memesWaveId, proxyId } =
-    useMemesQuickVoteContext();
-  const waveId =
-    typeof memesWaveId === "string" && memesWaveId.length > 0
-      ? memesWaveId
-      : null;
-
-  const queryKey = useMemo(
-    () =>
-      getMemesQuickVoteSummaryQueryKey({
-        contextProfile,
-        proxyId,
-        waveId,
-      }),
-    [contextProfile, proxyId, waveId]
-  );
-
-  const query = useQuery({
-    queryKey,
-    enabled: enabled && isEnabled && waveId !== null,
-    queryFn: () => fetchMemesQuickVoteSummary(waveId),
-    staleTime: 60_000,
-    refetchOnReconnect: false,
-    refetchOnWindowFocus: false,
-    ...getDefaultQueryRetry(),
-  });
-
-  const firstDrop = useMemo(() => {
-    const drop = query.data?.drops[0];
-    const wave = query.data?.wave;
-
-    if (!drop || !wave) {
-      return null;
-    }
-
-    return buildMemesQuickVoteApiDrop(drop, wave);
-  }, [query.data?.drops, query.data?.wave]);
-
-  const count = query.data?.count ?? 0;
-  const stats = useMemo(
-    () => deriveMemesQuickVoteStatsFromDrop({ count, drop: firstDrop }),
-    [count, firstDrop]
-  );
-
-  return {
-    ...query,
-    count,
-    firstDrop,
-    isQuickVoteEnabled: isEnabled,
-    stats,
-  };
-};
diff --git a/hooks/useMemesWaveFooterStats.ts b/hooks/useMemesWaveFooterStats.ts
index 9d7caa9f53..5589a4b357 100644
--- a/hooks/useMemesWaveFooterStats.ts
+++ b/hooks/useMemesWaveFooterStats.ts
@@ -1,128 +1,82 @@
 "use client";
 
+import { getDefaultQueryRetry } from "@/components/react-query-wrapper/utils/query-utils";
 import {
-  getMemesQuickVoteRemainingCount,
+  isMemesQuickVoteVoteableDrop,
   type MemesQuickVoteStats,
 } from "@/hooks/memesQuickVote.helpers";
 import {
-  createInitialMemesQuickVoteDiscoveryState,
-  deriveMemesQuickVoteDiscoverySnapshot,
-  getMemesQuickVoteDiscoveredQueue,
-} from "@/hooks/memesQuickVote.queue.helpers";
+  fetchMemesQuickVoteUndiscoveredDrop,
+  getMemesQuickVoteUndiscoveredDropQueryKey,
+} from "@/hooks/memesQuickVote.query";
 import { useMemesQuickVoteContext } from "@/hooks/useMemesQuickVoteContext";
-import { fetchMemesQuickVoteDiscoveryBatch } from "@/hooks/memesQuickVote.query";
-import { useMemesQuickVoteSkippedDropIds } from "@/hooks/useMemesQuickVoteStorage";
-import { useMemesQuickVoteSummary } from "@/hooks/useMemesQuickVoteSummary";
-import { useEffect } from "react";
+import { WAVE_VOTING_LABELS } from "@/helpers/waves/waves.constants";
 import { useQuery } from "@tanstack/react-query";
 
 type MemesWaveFooterStats = MemesQuickVoteStats & {
+  readonly isAvailable: boolean;
   readonly isReady: boolean;
 };
 
 const EMPTY_STATS: MemesWaveFooterStats = {
+  isAvailable: false,
+  isReady: false,
   uncastPower: null,
   unratedCount: 0,
   votingLabel: null,
-  isReady: false,
 };
 
 export const useMemesWaveFooterStats = (): MemesWaveFooterStats => {
   const { contextProfile, isEnabled, memesWaveId, proxyId } =
     useMemesQuickVoteContext();
-  const { setAndPersistSkippedDropIds, skippedDropIds } =
-    useMemesQuickVoteSkippedDropIds({
+  const waveId =
+    typeof memesWaveId === "string" && memesWaveId.length > 0
+      ? memesWaveId
+      : null;
+  const query = useQuery({
+    queryKey: getMemesQuickVoteUndiscoveredDropQueryKey({
       contextProfile,
-      memesWaveId,
       proxyId,
-    });
-  const { isSuccess, stats } = useMemesQuickVoteSummary();
-  const rawUnratedCount = getMemesQuickVoteRemainingCount({
-    count: stats.unratedCount,
-    hiddenCount: skippedDropIds.length,
-  });
-  const shouldRecoverVisibility =
-    isEnabled &&
-    isSuccess &&
-    stats.unratedCount > 0 &&
-    skippedDropIds.length > 0 &&
-    rawUnratedCount <= 0 &&
-    typeof memesWaveId === "string" &&
-    memesWaveId.length > 0;
-  const recoveredFooterCount = useQuery({
-    queryKey: [
-      "memes-quick-vote-footer-recovery",
-      {
-        contextProfile,
-        proxyId,
-        skippedSignature: skippedDropIds.join(","),
-        waveId: memesWaveId,
-      },
-    ],
-    enabled: shouldRecoverVisibility,
-    queryFn: async () => {
-      const waveId = memesWaveId;
-
-      if (typeof waveId !== "string" || waveId.length === 0) {
-        return 0;
-      }
-
-      const discoveryState = createInitialMemesQuickVoteDiscoveryState();
-      const discoveryData = await fetchMemesQuickVoteDiscoveryBatch({
-        discoveryState,
-        skippedDropIds,
+      sessionId: 0,
+      skip: 0,
+      waveId,
+    }),
+    enabled: isEnabled && waveId !== null,
+    queryFn: ({ signal }) =>
+      fetchMemesQuickVoteUndiscoveredDrop({
+        skip: 0,
+        signal,
         waveId,
-      });
-      const snapshot = deriveMemesQuickVoteDiscoverySnapshot({
-        enabled: true,
-        pages: discoveryData.pages,
-        skippedDropIds,
-        state: discoveryState,
-      });
-
-      return getMemesQuickVoteDiscoveredQueue(snapshot).length;
-    },
-    retry: false,
+      }),
+    staleTime: 60_000,
     refetchOnReconnect: false,
     refetchOnWindowFocus: false,
-    staleTime: 60_000,
+    ...getDefaultQueryRetry(),
   });
-  let unratedCount = rawUnratedCount;
-
-  if (shouldRecoverVisibility) {
-    if (typeof recoveredFooterCount.data === "number") {
-      unratedCount = recoveredFooterCount.data;
-    } else if (recoveredFooterCount.isError) {
-      unratedCount = stats.unratedCount;
-    } else {
-      unratedCount = 0;
-    }
-  }
-
-  useEffect(() => {
-    if (!isSuccess || stats.unratedCount > 0 || skippedDropIds.length === 0) {
-      return;
-    }
-
-    setAndPersistSkippedDropIds(() => []);
-  }, [
-    isSuccess,
-    setAndPersistSkippedDropIds,
-    skippedDropIds.length,
-    stats.unratedCount,
-  ]);
-
-  if (shouldRecoverVisibility && recoveredFooterCount.isPending) {
-    return EMPTY_STATS;
-  }
+  const activeDrop = query.data?.drop ?? null;
+  const uncastPower = activeDrop?.context_profile_context?.max_rating ?? null;
+  const isAvailable =
+    isEnabled &&
+    waveId !== null &&
+    (!query.isSuccess || isMemesQuickVoteVoteableDrop(activeDrop));
 
-  if (typeof stats.uncastPower !== "number" || unratedCount <= 0) {
-    return EMPTY_STATS;
+  if (
+    !query.isSuccess ||
+    !activeDrop ||
+    !isMemesQuickVoteVoteableDrop(activeDrop) ||
+    typeof uncastPower !== "number"
+  ) {
+    return {
+      ...EMPTY_STATS,
+      isAvailable,
+    };
   }
 
   return {
-    ...stats,
-    unratedCount,
+    isAvailable,
+    uncastPower,
+    unratedCount: query.data.total_count,
+    votingLabel: WAVE_VOTING_LABELS[activeDrop.wave.voting_credit_type],
     isReady: true,
   };
 };
diff --git a/hooks/usePrefetchMemesQuickVote.ts b/hooks/usePrefetchMemesQuickVote.ts
deleted file mode 100644
index a49566c5a8..0000000000
--- a/hooks/usePrefetchMemesQuickVote.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-"use client";
-
-import { getDefaultQueryRetry } from "@/components/react-query-wrapper/utils/query-utils";
-import {
-  createInitialMemesQuickVoteDiscoveryState,
-  deriveMemesQuickVoteDiscoverySnapshot,
-  getMemesQuickVoteActiveCandidateId,
-  getMemesQuickVoteNextCandidateId,
-} from "@/hooks/memesQuickVote.queue.helpers";
-import {
-  fetchMemesQuickVoteDiscoveryBatch,
-  fetchMemesQuickVoteDrop,
-  fetchMemesQuickVoteSummary,
-  getMemesQuickVoteDiscoveryQueryKey,
-  getMemesQuickVoteDiscoveryStateKey,
-  getMemesQuickVoteDropQueryKey,
-  getMemesQuickVoteSummaryQueryKey,
-} from "@/hooks/memesQuickVote.query";
-import { useMemesQuickVoteContext } from "@/hooks/useMemesQuickVoteContext";
-import { useMemesQuickVoteStorage } from "@/hooks/useMemesQuickVoteStorage";
-import { useQueryClient } from "@tanstack/react-query";
-import { useCallback } from "react";
-
-export const usePrefetchMemesQuickVote = () => {
-  const queryClient = useQueryClient();
-  const { contextProfile, isEnabled, memesWaveId, proxyId } =
-    useMemesQuickVoteContext();
-  const { skippedDropIds } = useMemesQuickVoteStorage({
-    contextProfile,
-    memesWaveId,
-    proxyId,
-  });
-
-  return useCallback(
-    async (sessionId: number) => {
-      const waveId =
-        typeof memesWaveId === "string" && memesWaveId.length > 0
-          ? memesWaveId
-          : null;
-
-      if (!isEnabled || !contextProfile || !waveId) {
-        return;
-      }
-
-      const discoveryState = createInitialMemesQuickVoteDiscoveryState();
-      const discoveryStateKey = getMemesQuickVoteDiscoveryStateKey({
-        contextProfile,
-        enabled: true,
-        memesWaveId: waveId,
-        sessionId,
-      });
-      const summaryPromise = queryClient.prefetchQuery({
-        queryKey: getMemesQuickVoteSummaryQueryKey({
-          contextProfile,
-          proxyId,
-          waveId,
-        }),
-        queryFn: () => fetchMemesQuickVoteSummary(waveId),
-        staleTime: 60_000,
-        ...getDefaultQueryRetry(),
-      });
-      const discoveryData = await queryClient.fetchQuery({
-        queryKey: getMemesQuickVoteDiscoveryQueryKey({
-          discoveryStateKey,
-          fetchVersion: 0,
-          waveId,
-        }),
-        queryFn: () =>
-          fetchMemesQuickVoteDiscoveryBatch({
-            discoveryState,
-            skippedDropIds,
-            waveId,
-          }),
-        retry: false,
-      });
-      const discoverySnapshot = deriveMemesQuickVoteDiscoverySnapshot({
-        enabled: true,
-        pages: discoveryData.pages,
-        skippedDropIds,
-        state: discoveryState,
-      });
-      const activeCandidateId =
-        getMemesQuickVoteActiveCandidateId(discoverySnapshot);
-      const nextCandidateId =
-        getMemesQuickVoteNextCandidateId(discoverySnapshot);
-      const dropPrefetches = [activeCandidateId, nextCandidateId]
-        .filter((dropId): dropId is string => !!dropId)
-        .map((dropId) =>
-          queryClient.prefetchQuery({
-            queryKey: getMemesQuickVoteDropQueryKey({
-              contextProfile,
-              dropId,
-              proxyId,
-            }),
-            queryFn: () => fetchMemesQuickVoteDrop(dropId),
-            ...getDefaultQueryRetry(),
-          })
-        );
-
-      await Promise.all([summaryPromise, ...dropPrefetches]);
-    },
-    [
-      contextProfile,
-      isEnabled,
-      memesWaveId,
-      proxyId,
-      queryClient,
-      skippedDropIds,
-    ]
-  );
-};
diff --git a/openapi.yaml b/openapi.yaml
index cea7fe86e5..febe7584b8 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -5650,6 +5650,40 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiWaveDropsFeed"
+  /waves/{id}/undiscovered-drop:
+    get:
+      tags:
+        - Waves
+      summary: Get the next undiscovered participatory drop for quick vote
+      operationId: getWaveUndiscoveredDrop
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: skip
+          in: query
+          required: false
+          description: >-
+            Zero-based offset into the newest unvoted and unskipped drops for
+            this wave. If no unskipped drops remain, the offset applies to the
+            earliest skipped unvoted drops instead.
+          schema:
+            type: integer
+            format: int64
+            minimum: 0
+      responses:
+        "200":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiUndiscoveredDrop"
+        "403":
+          description: User is not eligible to quick vote in this wave
+        "404":
+          description: Wave not found
   /waves/{id}/pinned-drop:
     post:
       tags:
@@ -7963,10 +7997,6 @@ components:
           nullable: true
         period:
           $ref: "#/components/schemas/ApiIntRange"
-        submission_strategy:
-          anyOf:
-            - type: "null"
-            - $ref: "#/components/schemas/ApiWaveParticipationSubmissionStrategy"
     ApiCreateNewWaveScope:
       type: object
       required:
@@ -8281,7 +8311,7 @@ components:
         metadata:
           type: array
           items:
-            $ref: "#/components/schemas/ApiDropMetadataResponse"
+            $ref: "#/components/schemas/ApiDropMetadata"
         rating:
           type: number
           format: int64
@@ -8437,22 +8467,6 @@ components:
         data_value:
           type: string
           maxLength: 5000
-    ApiDropMetadataResponse:
-      type: object
-      required:
-        - data_key
-        - data_value
-      properties:
-        data_key:
-          type: string
-          maxLength: 500
-        data_value:
-          type: string
-          maxLength: 5000
-        resolved_profile:
-          anyOf:
-            - type: "null"
-            - $ref: "#/components/schemas/ApiProfileMin"
     ApiDropNftLink:
       type: object
       required:
@@ -8505,7 +8519,6 @@ components:
       type: object
       required:
         - rating
-        - category
       properties:
         rating:
           type: number
@@ -8513,6 +8526,7 @@ components:
         category:
           type: string
           maxLength: 100
+          nullable: true
     ApiDropReaction:
       type: object
       required:
@@ -8731,7 +8745,7 @@ components:
         metadata:
           type: array
           items:
-            $ref: "#/components/schemas/ApiDropMetadataResponse"
+            $ref: "#/components/schemas/ApiDropMetadata"
         rating:
           type: number
           format: int64
@@ -10918,6 +10932,19 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/ApiTransaction"
+    ApiUndiscoveredDrop:
+      type: object
+      required:
+        - drop
+        - total_count
+      properties:
+        drop:
+          anyOf:
+            - type: "null"
+            - $ref: "#/components/schemas/ApiDrop"
+        total_count:
+          type: integer
+          format: int64
     ApiUpcomingMemeSubscriptionStatus:
       type: object
       required:
@@ -10983,55 +11010,6 @@ components:
             Decisions before this time will not be made. Should not overlap with
             other pauses. Needs to be after start_time, after now and after
             wave.next_decision_time
-    ApiUpdateWaveParticipationConfig:
-      type: object
-      required:
-        - scope
-        - required_metadata
-        - signature_required
-        - no_of_applications_allowed_per_participant
-        - required_media
-        - terms
-      properties:
-        scope:
-          $ref: "#/components/schemas/ApiCreateNewWaveScope"
-        no_of_applications_allowed_per_participant:
-          description: >-
-            The number of applications allowed per participant. Infinite if
-            omitted.
-          type: integer
-          format: int64
-          nullable: true
-          minimum: 1
-        required_media:
-          type: array
-          items:
-            $ref: "#/components/schemas/ApiWaveParticipationRequirement"
-        required_metadata:
-          description: |
-            The metadata that must be provided by the participant. 
-            Empty array if nothing is required.
-          type: array
-          items:
-            $ref: "#/components/schemas/ApiWaveRequiredMetadata"
-        signature_required:
-          description: If true then the votes must be signed by voters.
-          type: boolean
-        terms:
-          description: >-
-            If this is and the "signature_required" is set then this will be
-            embedded as a signature input data component for each drop.
-          type: string
-          nullable: true
-        period:
-          $ref: "#/components/schemas/ApiIntRange"
-        submission_strategy:
-          description: >-
-            If omitted, the existing submission strategy is preserved. Set
-            explicitly to null to clear it.
-          anyOf:
-            - type: "null"
-            - $ref: "#/components/schemas/ApiWaveParticipationSubmissionStrategy"
     ApiUpdateWaveRequest:
       type: object
       required:
@@ -11057,17 +11035,10 @@ components:
         visibility:
           $ref: "#/components/schemas/ApiCreateNewWaveVisibilityConfig"
         participation:
-          description: >-
-            Wave participation configuration. `submission_strategy` is immutable
-            after creation and, if provided on update, must match the existing
-            value exactly.
-          $ref: "#/components/schemas/ApiUpdateWaveParticipationConfig"
+          $ref: "#/components/schemas/ApiCreateNewWaveParticipationConfig"
         chat:
           $ref: "#/components/schemas/ApiCreateNewWaveChatConfig"
         wave:
-          description: >-
-            Wave configuration. `type` is immutable after creation and must
-            match the existing wave type on update.
           $ref: "#/components/schemas/ApiCreateWaveConfig"
     ApiUploadItem:
       type: object
@@ -11723,55 +11694,12 @@ components:
         terms:
           type: string
           nullable: true
-        submission_strategy:
-          anyOf:
-            - type: "null"
-            - $ref: "#/components/schemas/ApiWaveParticipationSubmissionStrategy"
-    ApiWaveParticipationIdentitySubmissionAllowDuplicates:
-      type: string
-      enum:
-        - ALWAYS_ALLOW
-        - ALLOW_AFTER_WIN
-        - NEVER_ALLOW
-    ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted:
-      type: string
-      enum:
-        - ONLY_MYSELF
-        - ONLY_OTHERS
-        - EVERYONE
     ApiWaveParticipationRequirement:
       type: string
       enum:
         - IMAGE
         - AUDIO
         - VIDEO
-    ApiWaveParticipationSubmissionStrategy:
-      type: object
-      required:
-        - type
-        - config
-      properties:
-        type:
-          $ref: "#/components/schemas/ApiWaveParticipationSubmissionStrategyType"
-        config:
-          $ref: >-
-            #/components/schemas/ApiWaveParticipationSubmissionStrategyIdentityConf
-    ApiWaveParticipationSubmissionStrategyIdentityConf:
-      type: object
-      required:
-        - duplicates
-        - who_can_be_submitted
-      properties:
-        duplicates:
-          $ref: >-
-            #/components/schemas/ApiWaveParticipationIdentitySubmissionAllowDuplicates
-        who_can_be_submitted:
-          $ref: >-
-            #/components/schemas/ApiWaveParticipationIdentitySubmissionWhoCanBeSubmitted
-    ApiWaveParticipationSubmissionStrategyType:
-      type: string
-      enum:
-        - IDENTITY
     ApiWaveRequiredMetadata:
       type: object
       required: