diff --git a/app/api/checkout/success/route.ts b/app/api/checkout/success/route.ts
index a2c04ef6..3c97e821 100644
--- a/app/api/checkout/success/route.ts
+++ b/app/api/checkout/success/route.ts
@@ -57,5 +57,7 @@ export async function GET(req: NextRequest) {
     console.error("Error processing checkout success:", err);
   }
 
-  return NextResponse.redirect(new URL(returnUrl, req.url));
+  const redirectUrl = new URL(returnUrl, req.url);
+  redirectUrl.searchParams.set("upgrade", "success");
+  return NextResponse.redirect(redirectUrl);
 }
diff --git a/app/api/rpc/[command]/get_publication_analytics.ts b/app/api/rpc/[command]/get_publication_analytics.ts
index 749e6e78..540c4564 100644
--- a/app/api/rpc/[command]/get_publication_analytics.ts
+++ b/app/api/rpc/[command]/get_publication_analytics.ts
@@ -21,7 +21,7 @@ export const get_publication_analytics = makeRoute({
     { supabase }: Pick<Env, "supabase">,
   ) => {
     const identity = await getIdentityData();
-    if (!identity?.atp_did || !identity.entitlements?.publication_analytics) {
+    if (!identity?.atp_did || !identity.entitlements?.publication_analytics || !identity.entitlements?.pro_plan_visible) {
       return { error: "unauthorized" as const };
     }
 
diff --git a/app/api/rpc/[command]/get_publication_subscribers_timeseries.ts b/app/api/rpc/[command]/get_publication_subscribers_timeseries.ts
index 81bd65a4..ac280b7c 100644
--- a/app/api/rpc/[command]/get_publication_subscribers_timeseries.ts
+++ b/app/api/rpc/[command]/get_publication_subscribers_timeseries.ts
@@ -19,7 +19,7 @@ export const get_publication_subscribers_timeseries = makeRoute({
     { supabase }: Pick<Env, "supabase">,
   ) => {
     const identity = await getIdentityData();
-    if (!identity?.atp_did || !identity.entitlements?.publication_analytics) {
+    if (!identity?.atp_did || !identity.entitlements?.publication_analytics || !identity.entitlements?.pro_plan_visible) {
       return { error: "unauthorized" as const };
     }
 
diff --git a/app/layout.tsx b/app/layout.tsx
index 16e89e78..0b31dcdd 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -9,6 +9,8 @@ import { IdentityProviderServer } from "components/IdentityProviderServer";
 import { headers } from "next/headers";
 import { RequestHeadersProvider } from "components/Providers/RequestHeadersProvider";
 import { RouteUIStateManager } from "components/RouteUIStateManger";
+import { SubscriptionSuccessModal } from "components/SubscriptionSuccessModal";
+import { Suspense } from "react";
 
 export const metadata = {
   title: "Leaflet",
@@ -87,6 +89,9 @@ export default async function RootLayout({
                 timezone={ipTimezone}
               >
                 <ViewportSizeLayout>{children}</ViewportSizeLayout>
+                <Suspense>
+                  <SubscriptionSuccessModal />
+                </Suspense>
                 <RouteUIStateManager />
               </RequestHeadersProvider>
             </IdentityProviderServer>
diff --git a/app/lish/[did]/[publication]/dashboard/Actions.tsx b/app/lish/[did]/[publication]/dashboard/Actions.tsx
index df919ee7..bac897c7 100644
--- a/app/lish/[did]/[publication]/dashboard/Actions.tsx
+++ b/app/lish/[did]/[publication]/dashboard/Actions.tsx
@@ -13,14 +13,15 @@ import { SpeedyLink } from "components/SpeedyLink";
 import { ButtonSecondary, ButtonTertiary } from "components/Buttons";
 import { UpgradeModal } from "../UpgradeModal";
 import { LeafletPro } from "components/Icons/LeafletPro";
-import { useIsPro } from "src/hooks/useEntitlement";
+import { useIsPro, useCanSeePro } from "src/hooks/useEntitlement";
 
 export const Actions = (props: { publication: string }) => {
   let isPro = useIsPro();
+  let canSeePro = useCanSeePro();
   return (
     <>
       <NewDraftActionButton publication={props.publication} />
-      {!isPro && <MobileUpgrade />}
+      {canSeePro && !isPro && <MobileUpgrade />}
 
       <PublicationShareButton />
       <PublicationSettingsButton publication={props.publication} />
diff --git a/app/lish/[did]/[publication]/dashboard/PublicationAnalytics.tsx b/app/lish/[did]/[publication]/dashboard/PublicationAnalytics.tsx
index c256a60e..0ea36d2e 100644
--- a/app/lish/[did]/[publication]/dashboard/PublicationAnalytics.tsx
+++ b/app/lish/[did]/[publication]/dashboard/PublicationAnalytics.tsx
@@ -7,7 +7,7 @@ import { useLocalizedDate } from "src/hooks/useLocalizedDate";
 import type { DateRange } from "react-day-picker";
 import { usePublicationData } from "./PublicationSWRProvider";
 import { Combobox, ComboboxResult } from "components/Combobox";
-import { useIsPro } from "src/hooks/useEntitlement";
+import { useIsPro, useCanSeePro } from "src/hooks/useEntitlement";
 import { callRPC } from "app/api/rpc/client";
 import useSWR from "swr";
 import {
@@ -76,6 +76,7 @@ export const PublicationAnalytics = (props: {
   showPageBackground: boolean;
 }) => {
   let isPro = useIsPro();
+  let canSeePro = useCanSeePro();
 
   let { data: publication } = usePublicationData();
   let [dateRange, setDateRange] = useState<DateRange>(() => {
@@ -146,6 +147,8 @@ export const PublicationAnalytics = (props: {
     [analyticsData?.traffic, dateRange.from, dateRange.to],
   );
 
+  if (!canSeePro) return null;
+
   if (!isPro)
     return (
       <div className="sm:mx-auto pt-4 s">
diff --git a/components/ActionBar/ProfileButton.tsx b/components/ActionBar/ProfileButton.tsx
index a6da2387..58983d4e 100644
--- a/components/ActionBar/ProfileButton.tsx
+++ b/components/ActionBar/ProfileButton.tsx
@@ -12,7 +12,7 @@ import { ArrowRightTiny } from "components/Icons/ArrowRightTiny";
 import { Modal } from "components/Modal";
 import { UpgradeContent } from "app/lish/[did]/[publication]/UpgradeModal";
 import { ManageProSubscription } from "app/lish/[did]/[publication]/dashboard/settings/ManageProSubscription";
-import { useIsPro } from "src/hooks/useEntitlement";
+import { useIsPro, useCanSeePro } from "src/hooks/useEntitlement";
 import { useState } from "react";
 
 export const ProfileButton = () => {
@@ -21,6 +21,7 @@ export const ProfileButton = () => {
   let isMobile = useIsMobile();
   let [state, setState] = useState<"menu" | "manage-subscription">("menu");
   let isPro = useIsPro();
+  let canSeePro = useCanSeePro();
 
   return (
     <Popover
@@ -69,29 +70,33 @@ export const ProfileButton = () => {
               <hr className="border-border-light border-dashed" />
             </>
           )}
-          {!isPro ? (
-            <Modal
-              trigger={
-                <div className="menuItem -mx-[8px] text-left flex items-center justify-between hover:no-underline! bg-[var(--accent-light)]! border border-transparent hover:border-accent-contrast">
-                  Get Leaflet Pro
+          {canSeePro && (
+            <>
+              {!isPro ? (
+                <Modal
+                  trigger={
+                    <div className="menuItem -mx-[8px] text-left flex items-center justify-between hover:no-underline! bg-[var(--accent-light)]! border border-transparent hover:border-accent-contrast">
+                      Get Leaflet Pro
+                      <ArrowRightTiny />
+                    </div>
+                  }
+                >
+                  <UpgradeContent />
+                </Modal>
+              ) : (
+                <button
+                  className="menuItem -mx-[8px] text-left flex items-center justify-between hover:no-underline!"
+                  type="button"
+                  onClick={() => setState("manage-subscription")}
+                >
+                  Manage Pro Subscription
                   <ArrowRightTiny />
-                </div>
-              }
-            >
-              <UpgradeContent />
-            </Modal>
-          ) : (
-            <button
-              className="menuItem -mx-[8px] text-left flex items-center justify-between hover:no-underline!"
-              type="button"
-              onClick={() => setState("manage-subscription")}
-            >
-              Manage Pro Subscription
-              <ArrowRightTiny />
-            </button>
-          )}
+                </button>
+              )}
 
-          <hr className="border-border-light border-dashed" />
+              <hr className="border-border-light border-dashed" />
+            </>
+          )}
 
           <button
             type="button"
diff --git a/components/SubscriptionSuccessModal.tsx b/components/SubscriptionSuccessModal.tsx
new file mode 100644
index 00000000..a2146f7e
--- /dev/null
+++ b/components/SubscriptionSuccessModal.tsx
@@ -0,0 +1,61 @@
+"use client";
+
+import { useSearchParams, useRouter, usePathname } from "next/navigation";
+import { useEffect, useState } from "react";
+import { useIdentityData } from "./IdentityProvider";
+import { Modal } from "./Modal";
+
+export function SubscriptionSuccessModal() {
+  let searchParams = useSearchParams();
+  let router = useRouter();
+  let pathname = usePathname();
+  let { identity, mutate } = useIdentityData();
+  let [open, setOpen] = useState(false);
+  let [loading, setLoading] = useState(true);
+
+  let isUpgradeSuccess = searchParams.get("upgrade") === "success";
+
+  useEffect(() => {
+    if (!isUpgradeSuccess) return;
+    setOpen(true);
+    setLoading(true);
+    mutate().then(() => setLoading(false));
+  }, [isUpgradeSuccess]);
+
+  function handleOpenChange(next: boolean) {
+    setOpen(next);
+    if (!next) {
+      let params = new URLSearchParams(searchParams.toString());
+      params.delete("upgrade");
+      let qs = params.toString();
+      router.replace(qs ? `${pathname}?${qs}` : pathname, { scroll: false });
+    }
+  }
+
+  if (!isUpgradeSuccess && !open) return null;
+
+  return (
+    <Modal
+      open={open}
+      onOpenChange={handleOpenChange}
+      trigger={<span />}
+      title="Welcome to Pro"
+      className="w-80"
+    >
+      {loading ? (
+        <div className="flex flex-col items-center gap-3 py-4">
+          <div className="h-5 w-5 animate-spin rounded-full border-2 border-border border-t-accent-contrast" />
+          <p className="text-secondary text-sm">
+            Activating your subscription...
+          </p>
+        </div>
+      ) : (
+        <div className="flex flex-col gap-2 py-2">
+          <p className="text-secondary text-sm">
+            Your Pro subscription is active. Thanks for supporting Leaflet!
+          </p>
+        </div>
+      )}
+    </Modal>
+  );
+}
diff --git a/src/hooks/useEntitlement.ts b/src/hooks/useEntitlement.ts
index f3e906a9..8d1c0325 100644
--- a/src/hooks/useEntitlement.ts
+++ b/src/hooks/useEntitlement.ts
@@ -9,3 +9,7 @@ export function useHasEntitlement(key: string): boolean {
 export function useIsPro(): boolean {
   return useHasEntitlement("publication_analytics");
 }
+
+export function useCanSeePro(): boolean {
+  return useHasEntitlement("pro_plan_visible");
+}
diff --git a/stripe/products.ts b/stripe/products.ts
index 32501885..820a4c60 100644
--- a/stripe/products.ts
+++ b/stripe/products.ts
@@ -4,7 +4,7 @@ export const PRODUCT_DEFINITION = {
   name: "Leaflet Pro",
   metadata: {
     product_def_id: PRODUCT_DEF_ID,
-    entitlements: JSON.stringify({ publication_analytics: true }),
+    entitlements: JSON.stringify({ publication_analytics: true, pro_plan_visible: true }),
   },
 };