diff --git a/apps/client/src/ee/base/pages/base-page.tsx b/apps/client/src/ee/base/pages/base-page.tsx
index 7f315ee7f..c533dadad 100644
--- a/apps/client/src/ee/base/pages/base-page.tsx
+++ b/apps/client/src/ee/base/pages/base-page.tsx
@@ -29,7 +29,7 @@ export default function BasePage() {
           {base.icon ? `${base.icon} ` : ""}{base.name}
         </Title>
       )}
-      <BaseView pageId={pageId} editable={hasBases && (base?.canEdit ?? false)} />
+      <BaseView pageId={pageId} editable={hasBases && (base?.permissions?.canEdit ?? false)} />
     </Container>
   );
 }
diff --git a/apps/client/src/ee/base/types/base.types.ts b/apps/client/src/ee/base/types/base.types.ts
index 444e401e3..c8f99ef31 100644
--- a/apps/client/src/ee/base/types/base.types.ts
+++ b/apps/client/src/ee/base/types/base.types.ts
@@ -246,8 +246,10 @@ export type IBase = {
   views: IBaseView[];
   createdAt: string;
   updatedAt: string;
-  /** Effective edit permission for the current user (page-restrictions included). */
-  canEdit?: boolean;
+  permissions?: {
+    canEdit: boolean;
+    hasRestriction: boolean;
+  };
   baseSchemaVersion: number;
 };
 
diff --git a/apps/client/src/features/editor/components/base-embed/base-embed-view.tsx b/apps/client/src/features/editor/components/base-embed/base-embed-view.tsx
index 2d7dbb2ab..69f7db1e5 100644
--- a/apps/client/src/features/editor/components/base-embed/base-embed-view.tsx
+++ b/apps/client/src/features/editor/components/base-embed/base-embed-view.tsx
@@ -132,7 +132,7 @@ export function BaseEmbedView({ node, editor, deleteNode }: NodeViewProps) {
       <BaseView
         pageId={pageId}
         embedded
-        editable={hasBases && editor.isEditable && (base?.canEdit ?? false)}
+        editable={hasBases && editor.isEditable && (base?.permissions?.canEdit ?? false)}
       />
     );
   }
diff --git a/apps/server/src/ee b/apps/server/src/ee
index ea7948747..21621440e 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit ea794874792dc39a48f4fedf42f236cfc0089200
+Subproject commit 21621440efce47bde317b503af4b230b8865f73b