diff --git a/app/lish/[did]/[publication]/dashboard/EditPagesNavLink.tsx b/app/lish/[did]/[publication]/dashboard/EditPagesNavLink.tsx
index c11e7152..2d087648 100644
--- a/app/lish/[did]/[publication]/dashboard/EditPagesNavLink.tsx
+++ b/app/lish/[did]/[publication]/dashboard/EditPagesNavLink.tsx
@@ -4,6 +4,7 @@ import { BlockDocPageSmall } from "components/Icons/BlockDocPageSmall";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { createPublicationPage } from "actions/createPublicationPage";
+import { useHasEntitlement } from "src/hooks/useEntitlement";
 import { usePublicationData } from "./PublicationSWRProvider";
 
 export function EditPagesNavLink(props: {
@@ -14,6 +15,7 @@ export function EditPagesNavLink(props: {
   let router = useRouter();
   let { data, mutate } = usePublicationData();
   let [loading, setLoading] = useState(false);
+  let editPubPagesEnabled = useHasEntitlement("edit-pub-pages");
 
   let pages = data?.publication?.publication_pages || [];
 
@@ -42,6 +44,8 @@ export function EditPagesNavLink(props: {
     );
   }
 
+  if (!editPubPagesEnabled) return null;
+
   return (
     <ActionButton
       id="edit-pages-button"
diff --git a/app/lish/[did]/[publication]/edit/[[...route]]/layout.tsx b/app/lish/[did]/[publication]/edit/[[...route]]/layout.tsx
index f0e8d756..7e2b6e49 100644
--- a/app/lish/[did]/[publication]/edit/[[...route]]/layout.tsx
+++ b/app/lish/[did]/[publication]/edit/[[...route]]/layout.tsx
@@ -59,6 +59,10 @@ export default async function PublicationEditLayout(props: {
   let did = decodeURIComponent(params.did);
   if (!did) return <PubNotFound />;
 
+  if (!identity.entitlements?.["edit-pub-pages"]) {
+    return <PubNotFound />;
+  }
+
   let { result: publication_data } = await get_publication_data.handler(
     {
       did,