diff --git a/actions/getIdentityData.ts b/actions/getIdentityData.ts
index c83a287c..6ed8e690 100644
--- a/actions/getIdentityData.ts
+++ b/actions/getIdentityData.ts
@@ -42,7 +42,6 @@ export async function uncachedGetIdentityData() {
         .eq("confirmed", true)
         .single()
     : null;
-  console.log(auth_res);
   if (!auth_res?.data?.identities) return null;
   if (auth_res.data.identities.atp_did) {
     //I should create a relationship table so I can do this in the above query
diff --git a/app/api/rpc/[command]/get_user_recommendations.ts b/app/api/rpc/[command]/get_user_recommendations.ts
new file mode 100644
index 00000000..1c608695
--- /dev/null
+++ b/app/api/rpc/[command]/get_user_recommendations.ts
@@ -0,0 +1,40 @@
+import { z } from "zod";
+import { makeRoute } from "../lib";
+import type { Env } from "./route";
+import { getIdentityData } from "actions/getIdentityData";
+
+export type GetUserRecommendationsReturnType = Awaited<
+  ReturnType<(typeof get_user_recommendations)["handler"]>
+>;
+
+export const get_user_recommendations = makeRoute({
+  route: "get_user_recommendations",
+  input: z.object({
+    documentUris: z.array(z.string()),
+  }),
+  handler: async ({ documentUris }, { supabase }: Pick<Env, "supabase">) => {
+    const identity = await getIdentityData();
+    const currentUserDid = identity?.atp_did;
+
+    if (!currentUserDid || documentUris.length === 0) {
+      return {
+        result: {} as Record<string, boolean>,
+      };
+    }
+
+    const { data: recommendations } = await supabase
+      .from("recommends_on_documents")
+      .select("document")
+      .eq("recommender_did", currentUserDid)
+      .in("document", documentUris);
+
+    const recommendedSet = new Set(recommendations?.map((r) => r.document));
+
+    const result: Record<string, boolean> = {};
+    for (const uri of documentUris) {
+      result[uri] = recommendedSet.has(uri);
+    }
+
+    return { result };
+  },
+});
diff --git a/app/api/rpc/[command]/route.ts b/app/api/rpc/[command]/route.ts
index df7a865b..c6ba128e 100644
--- a/app/api/rpc/[command]/route.ts
+++ b/app/api/rpc/[command]/route.ts
@@ -14,6 +14,7 @@ import { get_publication_data } from "./get_publication_data";
 import { search_publication_names } from "./search_publication_names";
 import { search_publication_documents } from "./search_publication_documents";
 import { get_profile_data } from "./get_profile_data";
+import { get_user_recommendations } from "./get_user_recommendations";
 
 let supabase = createClient<Database>(
   process.env.NEXT_PUBLIC_SUPABASE_API_URL as string,
@@ -41,6 +42,7 @@ let Routes = [
   search_publication_names,
   search_publication_documents,
   get_profile_data,
+  get_user_recommendations,
 ];
 export async function POST(
   req: Request,
diff --git a/app/lish/[did]/[publication]/[rkey]/CanvasPage.tsx b/app/lish/[did]/[publication]/[rkey]/CanvasPage.tsx
index 03fb8cab..05c9e1c1 100644
--- a/app/lish/[did]/[publication]/[rkey]/CanvasPage.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/CanvasPage.tsx
@@ -72,7 +72,6 @@ export function CanvasPage({
         commentsCount={getCommentCount(document.comments_on_documents, pageId)}
         quotesCount={getQuoteCount(document.quotesAndMentions, pageId)}
         recommendsCount={document.recommendsCount}
-        hasRecommended={document.hasRecommended}
       />
       <CanvasContent
         blocks={blocks}
@@ -212,7 +211,6 @@ const CanvasMetadata = (props: {
   quotesCount: number | undefined;
   commentsCount: number | undefined;
   recommendsCount: number;
-  hasRecommended: boolean;
 }) => {
   let isMobile = useIsMobile();
   return (
@@ -221,7 +219,6 @@ const CanvasMetadata = (props: {
         quotesCount={props.quotesCount || 0}
         commentsCount={props.commentsCount || 0}
         recommendsCount={props.recommendsCount}
-        hasRecommended={props.hasRecommended}
         showComments={props.preferences.showComments !== false}
         showMentions={props.preferences.showMentions !== false}
         pageId={props.pageId}
diff --git a/app/lish/[did]/[publication]/[rkey]/Interactions/Interactions.tsx b/app/lish/[did]/[publication]/[rkey]/Interactions/Interactions.tsx
index 42b22cb9..54d68574 100644
--- a/app/lish/[did]/[publication]/[rkey]/Interactions/Interactions.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/Interactions/Interactions.tsx
@@ -107,7 +107,6 @@ export const Interactions = (props: {
   quotesCount: number;
   commentsCount: number;
   recommendsCount: number;
-  hasRecommended: boolean;
   className?: string;
   showComments: boolean;
   showMentions: boolean;
@@ -138,7 +137,6 @@ export const Interactions = (props: {
       <RecommendButton
         documentUri={document_uri}
         recommendsCount={props.recommendsCount}
-        hasRecommended={props.hasRecommended}
       />
 
       {props.quotesCount === 0 || props.showMentions === false ? null : (
@@ -177,7 +175,6 @@ export const ExpandedInteractions = (props: {
   quotesCount: number;
   commentsCount: number;
   recommendsCount: number;
-  hasRecommended: boolean;
   className?: string;
   showComments: boolean;
   showMentions: boolean;
@@ -238,7 +235,6 @@ export const ExpandedInteractions = (props: {
               <RecommendButton
                 documentUri={document_uri}
                 recommendsCount={props.recommendsCount}
-                hasRecommended={props.hasRecommended}
               />
               {props.quotesCount === 0 || !props.showMentions ? null : (
                 <button
diff --git a/app/lish/[did]/[publication]/[rkey]/Interactions/recommendAction.ts b/app/lish/[did]/[publication]/[rkey]/Interactions/recommendAction.ts
index 8f3a2eda..d0295f26 100644
--- a/app/lish/[did]/[publication]/[rkey]/Interactions/recommendAction.ts
+++ b/app/lish/[did]/[publication]/[rkey]/Interactions/recommendAction.ts
@@ -21,13 +21,12 @@ export async function recommendAction(args: {
   console.log("recommend action...");
   let identity = await getIdentityData();
   if (!identity || !identity.atp_did) {
-    console.log("recommended");
-
     return {
       success: false,
       error: {
         type: "oauth_session_expired",
         message: "Not authenticated",
+        did: "",
       },
     };
   }
@@ -58,7 +57,7 @@ export async function recommendAction(args: {
     record,
   );
 
-  await supabaseServerClient.from("recommends_on_documents").upsert({
+  let res = await supabaseServerClient.from("recommends_on_documents").upsert({
     uri: uri.toString(),
     document: args.document,
     recommender_did: credentialSession.did!,
@@ -67,6 +66,7 @@ export async function recommendAction(args: {
       ...record,
     } as unknown as Json,
   });
+  console.log(res);
 
   return {
     success: true,
@@ -84,6 +84,7 @@ export async function unrecommendAction(args: {
       error: {
         type: "oauth_session_expired",
         message: "Not authenticated",
+        did: "",
       },
     };
   }
diff --git a/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx b/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
index c628e044..32ada105 100644
--- a/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
@@ -92,7 +92,6 @@ export function LinearDocumentPage({
           }
           quotesCount={getQuoteCount(document.quotesAndMentions, pageId) || 0}
           recommendsCount={document.recommendsCount}
-          hasRecommended={document.hasRecommended}
         />
         {!hasPageBackground && <div className={`spacer h-8 w-full`} />}
       </PageWrapper>
diff --git a/app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader.tsx b/app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader.tsx
index f8e5de13..8db38856 100644
--- a/app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader.tsx
@@ -92,7 +92,6 @@ export function PostHeader(props: {
               getCommentCount(document?.comments_on_documents || []) || 0
             }
             recommendsCount={document?.recommendsCount || 0}
-            hasRecommended={document?.hasRecommended || false}
           />
         </>
       }
diff --git a/app/lish/[did]/[publication]/[rkey]/getPostPageData.ts b/app/lish/[did]/[publication]/[rkey]/getPostPageData.ts
index 4d18cae5..7f16418a 100644
--- a/app/lish/[did]/[publication]/[rkey]/getPostPageData.ts
+++ b/app/lish/[did]/[publication]/[rkey]/getPostPageData.ts
@@ -8,12 +8,8 @@ import {
 } from "src/utils/normalizeRecords";
 import { PubLeafletPublication, SiteStandardPublication } from "lexicons/api";
 import { documentUriFilter } from "src/utils/uriHelpers";
-import { getIdentityData } from "actions/getIdentityData";
 
 export async function getPostPageData(did: string, rkey: string) {
-  const identity = await getIdentityData();
-  const currentUserDid = identity?.atp_did;
-
   let { data: documents } = await supabaseServerClient
     .from("documents")
     .select(
@@ -37,18 +33,6 @@ export async function getPostPageData(did: string, rkey: string) {
 
   if (!document) return null;
 
-  // Check if current user has recommended this document
-  let hasRecommended = false;
-  if (currentUserDid) {
-    const { data: userRecommend } = await supabaseServerClient
-      .from("recommends_on_documents")
-      .select("uri")
-      .eq("document", document.uri)
-      .eq("recommender_did", currentUserDid)
-      .limit(1);
-    hasRecommended = (userRecommend?.length ?? 0) > 0;
-  }
-
   // Normalize the document record - this is the primary way consumers should access document data
   const normalizedDocument = normalizeDocumentRecord(
     document.data,
@@ -178,7 +162,6 @@ export async function getPostPageData(did: string, rkey: string) {
     leafletId: document.leaflets_in_publications[0]?.leaflet || null,
     // Recommends data
     recommendsCount,
-    hasRecommended,
   };
 }
 
diff --git a/app/lish/[did]/[publication]/dashboard/PublishedPostsLists.tsx b/app/lish/[did]/[publication]/dashboard/PublishedPostsLists.tsx
index ae0e12bf..faf0d2e2 100644
--- a/app/lish/[did]/[publication]/dashboard/PublishedPostsLists.tsx
+++ b/app/lish/[did]/[publication]/dashboard/PublishedPostsLists.tsx
@@ -138,7 +138,6 @@ function PublishedPostItem(props: {
               quotesCount={doc.mentionsCount}
               commentsCount={doc.commentsCount}
               recommendsCount={doc.recommendsCount}
-              hasRecommended={false}
               documentUri={doc.uri}
               tags={doc.record.tags || []}
               showComments={pubRecord?.preferences?.showComments !== false}
diff --git a/app/lish/[did]/[publication]/page.tsx b/app/lish/[did]/[publication]/page.tsx
index 70a76ee4..1f82469d 100644
--- a/app/lish/[did]/[publication]/page.tsx
+++ b/app/lish/[did]/[publication]/page.tsx
@@ -170,7 +170,6 @@ export default async function Publication(props: {
                             quotesCount={quotes}
                             commentsCount={comments}
                             recommendsCount={recommends}
-                            hasRecommended={false}
                             documentUri={doc.documents.uri}
                             tags={tags}
                             postUrl={`${getPublicationURL(publication)}/${uri.rkey}`}
diff --git a/components/InteractionsPreview.tsx b/components/InteractionsPreview.tsx
index fe10fdf9..67ebf1e1 100644
--- a/components/InteractionsPreview.tsx
+++ b/components/InteractionsPreview.tsx
@@ -13,7 +13,6 @@ export const InteractionPreview = (props: {
   quotesCount: number;
   commentsCount: number;
   recommendsCount: number;
-  hasRecommended: boolean;
   documentUri: string;
   tags?: string[];
   postUrl: string;
@@ -43,7 +42,6 @@ export const InteractionPreview = (props: {
       <RecommendButton
         documentUri={props.documentUri}
         recommendsCount={props.recommendsCount}
-        hasRecommended={props.hasRecommended}
       />
 
       {!props.showMentions || props.quotesCount === 0 ? null : (
diff --git a/components/PostListing.tsx b/components/PostListing.tsx
index 7f056051..b66603b2 100644
--- a/components/PostListing.tsx
+++ b/components/PostListing.tsx
@@ -105,7 +105,6 @@ export const PostListing = (props: Post) => {
                 quotesCount={quotes}
                 commentsCount={comments}
                 recommendsCount={recommends}
-                hasRecommended={false}
                 documentUri={props.documents.uri}
                 tags={tags}
                 showComments={pubRecord?.preferences?.showComments !== false}
diff --git a/components/RecommendButton.tsx b/components/RecommendButton.tsx
index 1bab147e..d2081cd9 100644
--- a/components/RecommendButton.tsx
+++ b/components/RecommendButton.tsx
@@ -1,44 +1,104 @@
 "use client";
 
 import { useState } from "react";
+import useSWR, { mutate } from "swr";
+import { create, windowScheduler } from "@yornaath/batshit";
 import { RecommendTinyEmpty, RecommendTinyFilled } from "./Icons/RecommendTiny";
 import {
   recommendAction,
   unrecommendAction,
 } from "app/lish/[did]/[publication]/[rkey]/Interactions/recommendAction";
+import { callRPC } from "app/api/rpc/client";
+import { useToaster } from "./Toast";
+import { OAuthErrorMessage, isOAuthSessionError } from "./OAuthError";
 
+// Create a batcher for recommendation checks
+// Batches requests made within 10ms window
+const recommendationBatcher = create({
+  fetcher: async (documentUris: string[]) => {
+    const response = await callRPC("get_user_recommendations", { documentUris });
+    return response.result;
+  },
+  resolver: (results, documentUri) => results[documentUri] ?? false,
+  scheduler: windowScheduler(10),
+});
+
+const getRecommendationKey = (documentUri: string) =>
+  `recommendation:${documentUri}`;
+
+function useUserRecommendation(documentUri: string) {
+  const { data: hasRecommended, isLoading } = useSWR(
+    getRecommendationKey(documentUri),
+    () => recommendationBatcher.fetch(documentUri),
+  );
+
+  return {
+    hasRecommended: hasRecommended ?? false,
+    isLoading,
+  };
+}
+
+function mutateRecommendation(documentUri: string, hasRecommended: boolean) {
+  mutate(getRecommendationKey(documentUri), hasRecommended, {
+    revalidate: false,
+  });
+}
+
+/**
+ * RecommendButton that fetches the user's recommendation status asynchronously.
+ * Uses SWR with batched requests for efficient fetching when many buttons are rendered.
+ */
 export function RecommendButton(props: {
   documentUri: string;
   recommendsCount: number;
-  hasRecommended: boolean;
   className?: string;
   showCount?: boolean;
 }) {
-  const [hasRecommended, setHasRecommended] = useState(props.hasRecommended);
+  const { hasRecommended, isLoading } = useUserRecommendation(props.documentUri);
   const [count, setCount] = useState(props.recommendsCount);
   const [isPending, setIsPending] = useState(false);
+  const [optimisticRecommended, setOptimisticRecommended] = useState<
+    boolean | null
+  >(null);
+  const toaster = useToaster();
+
+  // Use optimistic state if set, otherwise use fetched state
+  const displayRecommended =
+    optimisticRecommended !== null ? optimisticRecommended : hasRecommended;
 
   const handleClick = async () => {
-    if (isPending) return;
+    if (isPending || isLoading) return;
 
-    const currentlyRecommended = hasRecommended;
+    const currentlyRecommended = displayRecommended;
     setIsPending(true);
-    setHasRecommended(!currentlyRecommended);
+    setOptimisticRecommended(!currentlyRecommended);
     setCount((c) => (currentlyRecommended ? c - 1 : c + 1));
 
-    try {
-      if (currentlyRecommended) {
-        await unrecommendAction({ document: props.documentUri });
-      } else {
-        await recommendAction({ document: props.documentUri });
-      }
-    } catch (error) {
-      // Revert on error
-      setHasRecommended(currentlyRecommended);
+    const result = currentlyRecommended
+      ? await unrecommendAction({ document: props.documentUri })
+      : await recommendAction({ document: props.documentUri });
+
+    if (!result.success) {
+      // Revert optimistic update
+      setOptimisticRecommended(null);
       setCount((c) => (currentlyRecommended ? c + 1 : c - 1));
-    } finally {
       setIsPending(false);
+
+      toaster({
+        content: isOAuthSessionError(result.error) ? (
+          <OAuthErrorMessage error={result.error} />
+        ) : (
+          "Failed to update recommendation"
+        ),
+        type: "error",
+      });
+      return;
     }
+
+    // Update the SWR cache to match the new state
+    mutateRecommendation(props.documentUri, !currentlyRecommended);
+    setOptimisticRecommended(null);
+    setIsPending(false);
   };
 
   const showCount = props.showCount !== false;
@@ -50,17 +110,17 @@ export function RecommendButton(props: {
         e.stopPropagation();
         handleClick();
       }}
-      disabled={isPending}
+      disabled={isPending || isLoading}
       className={`recommendButton flex gap-1  items-center hover:text-accent-contrast ${props.className || ""}`}
-      aria-label={hasRecommended ? "Remove recommend" : "Recommend"}
+      aria-label={displayRecommended ? "Remove recommend" : "Recommend"}
     >
-      {hasRecommended ? (
+      {displayRecommended ? (
         <RecommendTinyFilled className="text-accent-contrast" />
       ) : (
         <RecommendTinyEmpty />
       )}
       {showCount && count > 0 && (
-        <span className={`${hasRecommended && "text-accent-contrast"}`}>
+        <span className={`${displayRecommended && "text-accent-contrast"}`}>
           {count}
         </span>
       )}
diff --git a/contexts/DocumentContext.tsx b/contexts/DocumentContext.tsx
index fdd54954..d3157d69 100644
--- a/contexts/DocumentContext.tsx
+++ b/contexts/DocumentContext.tsx
@@ -22,7 +22,6 @@ export type DocumentContextValue = Pick<
   | "mentions"
   | "leafletId"
   | "recommendsCount"
-  | "hasRecommended"
 >;
 
 const DocumentContext = createContext<DocumentContextValue | null>(null);
diff --git a/package-lock.json b/package-lock.json
index 65a85d2a..e0de820a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,6 +38,7 @@
         "@vercel/analytics": "^1.5.0",
         "@vercel/functions": "^2.2.12",
         "@vercel/sdk": "^1.11.4",
+        "@yornaath/batshit": "^0.14.0",
         "babel-plugin-react-compiler": "^19.1.0-rc.1",
         "base64-js": "^1.5.1",
         "colorjs.io": "^0.5.2",
@@ -8500,6 +8501,21 @@
         }
       }
     },
+    "node_modules/@yornaath/batshit": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@yornaath/batshit/-/batshit-0.14.0.tgz",
+      "integrity": "sha512-0I+xMi5JoRs3+qVXXhk2AmsEl43MwrG+L+VW+nqw/qQqMFtgRPszLaxhJCfsBKnjfJ0gJzTI1Q9Q9+y903HyHQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@yornaath/batshit-devtools": "^1.7.1"
+      }
+    },
+    "node_modules/@yornaath/batshit-devtools": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@yornaath/batshit-devtools/-/batshit-devtools-1.7.1.tgz",
+      "integrity": "sha512-AyttV1Njj5ug+XqEWY1smV45dTWMlWKtj1B8jcFYgBKUFyUlF/qEhD+iP1E5UaRYW6hQRYD9T2WNDwFTrOMWzQ==",
+      "license": "MIT"
+    },
     "node_modules/abort-controller": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
diff --git a/package.json b/package.json
index e3f13bed..791a340a 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "@vercel/analytics": "^1.5.0",
     "@vercel/functions": "^2.2.12",
     "@vercel/sdk": "^1.11.4",
+    "@yornaath/batshit": "^0.14.0",
     "babel-plugin-react-compiler": "^19.1.0-rc.1",
     "base64-js": "^1.5.1",
     "colorjs.io": "^0.5.2",