diff --git a/packages/twenty-front/src/modules/settings/admin-panel/hooks/useFeatureFlagsManagement.ts b/packages/twenty-front/src/modules/settings/admin-panel/hooks/useFeatureFlagsManagement.ts
index 22ccd2b38..81378bf76 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/hooks/useFeatureFlagsManagement.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/hooks/useFeatureFlagsManagement.ts
@@ -4,6 +4,7 @@ import { isDefined } from 'twenty-ui';
 import {
   useUpdateWorkspaceFeatureFlagMutation,
   useUserLookupAdminPanelMutation,
+  FeatureFlagKey,
 } from '~/generated/graphql';
 
 export const useFeatureFlagsManagement = () => {
@@ -42,7 +43,7 @@ export const useFeatureFlagsManagement = () => {
 
   const handleFeatureFlagUpdate = async (
     workspaceId: string,
-    featureFlag: string,
+    featureFlag: FeatureFlagKey,
     value: boolean,
   ) => {
     setError(null);
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/types/FeatureFlag.ts b/packages/twenty-front/src/modules/settings/admin-panel/types/FeatureFlag.ts
index 2c9ab8913..7d31cd204 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/types/FeatureFlag.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/types/FeatureFlag.ts
@@ -1,4 +1,6 @@
+import { FeatureFlagKey } from '~/generated/graphql';
+
 export type FeatureFlag = {
-  key: string;
+  key: FeatureFlagKey;
   value: boolean;
 };
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
index 6e90eef74..0e91c3c57 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
@@ -8,7 +8,6 @@ import { UpdateWorkspaceFeatureFlagInput } from 'src/engine/core-modules/admin-p
 import { UserLookup } from 'src/engine/core-modules/admin-panel/dtos/user-lookup.entity';
 import { UserLookupInput } from 'src/engine/core-modules/admin-panel/dtos/user-lookup.input';
 import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { ImpersonateGuard } from 'src/engine/guards/impersonate-guard';
 import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@@ -41,7 +40,7 @@ export class AdminPanelResolver {
   ): Promise<boolean> {
     await this.adminService.updateWorkspaceFeatureFlags(
       updateFlagInput.workspaceId,
-      FeatureFlagKey[updateFlagInput.featureFlag],
+      updateFlagInput.featureFlag,
       updateFlagInput.value,
     );
 
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts
index e45a5afda..6ab51d89b 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts
@@ -118,7 +118,7 @@ export class AdminPanelService {
 
   async updateWorkspaceFeatureFlags(
     workspaceId: string,
-    featureFlag: string,
+    featureFlag: FeatureFlagKey,
     value: boolean,
   ) {
     featureFlagValidator.assertIsFeatureFlagKey(
@@ -140,14 +140,14 @@ export class AdminPanelService {
     );
 
     const existingFlag = workspace.featureFlags?.find(
-      (flag) => flag.key === featureFlag,
+      (flag) => flag.key === FeatureFlagKey[featureFlag],
     );
 
     if (existingFlag) {
       await this.featureFlagRepository.update(existingFlag.id, { value });
     } else {
       await this.featureFlagRepository.save({
-        key: featureFlag,
+        key: FeatureFlagKey[featureFlag],
         value,
         workspaceId: workspace.id,
       });
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.spec.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.spec.ts
index 1868576df..24f55ef5e 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.spec.ts
@@ -12,6 +12,7 @@ import {
   AuthException,
   AuthExceptionCode,
 } from 'src/engine/core-modules/auth/auth.exception';
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 
 const UserFindOneMock = jest.fn();
 const WorkspaceFindOneMock = jest.fn();
@@ -74,9 +75,13 @@ describe('AdminPanelService', () => {
 
   it('should update an existing feature flag if it exists', async () => {
     const workspaceId = 'workspace-id';
-    const featureFlag = 'IsFlagEnabled';
+    const featureFlag = 'IsFlagEnabled' as FeatureFlagKey;
     const value = true;
-    const existingFlag = { id: 'flag-id', key: featureFlag, value: false };
+    const existingFlag = {
+      id: 'flag-id',
+      key: 'IS_FLAG_ENABLED',
+      value: false,
+    };
 
     WorkspaceFindOneMock.mockReturnValueOnce({
       id: workspaceId,
@@ -93,7 +98,7 @@ describe('AdminPanelService', () => {
 
   it('should create a new feature flag if it does not exist', async () => {
     const workspaceId = 'workspace-id';
-    const featureFlag = 'IsFlagEnabled';
+    const featureFlag = 'IsFlagEnabled' as FeatureFlagKey;
     const value = true;
 
     WorkspaceFindOneMock.mockReturnValueOnce({
@@ -104,7 +109,7 @@ describe('AdminPanelService', () => {
     await service.updateWorkspaceFeatureFlags(workspaceId, featureFlag, value);
 
     expect(FeatureFlagSaveMock).toHaveBeenCalledWith({
-      key: featureFlag,
+      key: 'IS_FLAG_ENABLED',
       value,
       workspaceId,
     });
@@ -113,7 +118,7 @@ describe('AdminPanelService', () => {
 
   it('should throw an exception if the workspace is not found', async () => {
     const workspaceId = 'non-existent-workspace';
-    const featureFlag = 'IsFlagEnabled';
+    const featureFlag = 'IsFlagEnabled' as FeatureFlagKey;
     const value = true;
 
     WorkspaceFindOneMock.mockReturnValueOnce(null);
@@ -127,7 +132,7 @@ describe('AdminPanelService', () => {
 
   it('should throw an exception if the flag is not found', async () => {
     const workspaceId = 'non-existent-workspace';
-    const featureFlag = 'IsUnknownFlagEnabled';
+    const featureFlag = 'IsUnknownFlagEnabled' as FeatureFlagKey;
     const value = true;
 
     WorkspaceFindOneMock.mockReturnValueOnce(null);