diff --git a/front/src/modules/settings/components/SettingsNavbar.tsx b/front/src/modules/settings/components/SettingsNavbar.tsx
index bd2e0ce9b..afb2aa1af 100644
--- a/front/src/modules/settings/components/SettingsNavbar.tsx
+++ b/front/src/modules/settings/components/SettingsNavbar.tsx
@@ -16,6 +16,7 @@ import {
 import NavItem from '@/ui/navigation/navigation-drawer/components/NavItem';
 import NavTitle from '@/ui/navigation/navigation-drawer/components/NavTitle';
 import SubMenuNavbar from '@/ui/navigation/navigation-drawer/components/SubMenuNavbar';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 
 export const SettingsNavbar = () => {
   const navigate = useNavigate();
@@ -27,6 +28,12 @@ export const SettingsNavbar = () => {
     navigate(AppPath.SignIn);
   }, [signOut, navigate]);
 
+  const isMessagingEnabled = useIsFeatureEnabled('IS_MESSAGING_ENABLED');
+  const isMessagingActive = !!useMatch({
+    path: useResolvedPath('/settings/accounts').pathname,
+    end: true,
+  });
+
   return (
     <SubMenuNavbar backButtonTitle="Settings" displayVersion={true}>
       <NavTitle label="User" />
@@ -52,17 +59,15 @@ export const SettingsNavbar = () => {
           })
         }
       />
-      <NavItem
-        label="Accounts"
-        to="/settings/accounts"
-        Icon={IconAt}
-        active={
-          !!useMatch({
-            path: useResolvedPath('/settings/accounts').pathname,
-            end: true,
-          })
-        }
-      />
+
+      {isMessagingEnabled && (
+        <NavItem
+          label="Accounts"
+          to="/settings/accounts"
+          Icon={IconAt}
+          active={isMessagingActive}
+        />
+      )}
 
       <NavTitle label="Workspace" />
       <NavItem
diff --git a/server/src/database/typeorm-seeds/core/feature-flags.ts b/server/src/database/typeorm-seeds/core/feature-flags.ts
index 6d62f8aa1..87f1a0598 100644
--- a/server/src/database/typeorm-seeds/core/feature-flags.ts
+++ b/server/src/database/typeorm-seeds/core/feature-flags.ts
@@ -2,8 +2,6 @@ import { DataSource } from 'typeorm';
 
 const tableName = 'featureFlag';
 
-// import { SeedWorkspaceId } from 'src/database/typeorm-seeds/core/workspaces';
-
 export const seedFeatureFlags = async (
   workspaceDataSource: DataSource,
   schemaName: string,
@@ -20,6 +18,11 @@ export const seedFeatureFlags = async (
         workspaceId: workspaceId,
         value: true,
       },
+      {
+        key: 'IS_MESSAGING_ENABLED',
+        workspaceId: workspaceId,
+        value: true,
+      },
     ])
     .execute();
 };