diff --git a/apps/builder/app/builder/features/components/components.tsx b/apps/builder/app/builder/features/components/components.tsx
index 1bcbe2baf9e6..9d7a45ae9d36 100644
--- a/apps/builder/app/builder/features/components/components.tsx
+++ b/apps/builder/app/builder/features/components/components.tsx
@@ -3,6 +3,7 @@ import { useStore } from "@nanostores/react";
 import { CrossIcon } from "@webstudio-is/icons";
 import {
   type WsComponentMeta,
+  blockComponent,
   collectionComponent,
   componentCategories,
 } from "@webstudio-is/react-sdk";
@@ -123,6 +124,13 @@ const filterAndGroupComponents = ({
         return false;
       }
 
+      if (
+        component === blockComponent &&
+        isFeatureEnabled("contentEditableMode") === false
+      ) {
+        return false;
+      }
+
       return true;
     });
 
diff --git a/apps/builder/app/builder/features/topbar/builder-mode.tsx b/apps/builder/app/builder/features/topbar/builder-mode.tsx
index 65213d8b6bdd..fe8554bab81f 100644
--- a/apps/builder/app/builder/features/topbar/builder-mode.tsx
+++ b/apps/builder/app/builder/features/topbar/builder-mode.tsx
@@ -32,6 +32,7 @@ import {
   type BuilderMode,
 } from "~/shared/nano-states";
 import { useState } from "react";
+import { isFeatureEnabled } from "@webstudio-is/feature-flags";
 
 const StyledMenuItem = styled(DropdownMenuRadioItem, {
   "&:where([data-state='checked'])": {
@@ -57,7 +58,7 @@ export const BuilderModeDropDown = () => {
       description: "Modify the page content",
       title: "Content",
       shortcut: ["cmd", "shift", "c"],
-      enabled: isContentModeAllowed,
+      enabled: isContentModeAllowed && isFeatureEnabled("contentEditableMode"),
     },
     preview: {
       icon: <PlayIcon />,