diff --git a/front/.eslintrc.js b/front/.eslintrc.js
index b47ac0b666..d431859be8 100644
--- a/front/.eslintrc.js
+++ b/front/.eslintrc.js
@@ -11,6 +11,7 @@ module.exports = {
     'unused-imports',
     'simple-import-sort',
     'prefer-arrow',
+    'import',
     'twenty',
   ],
   extends: [
@@ -42,6 +43,7 @@ module.exports = {
         'react/jsx-uses-react': 'off',
         'react/react-in-jsx-scope': 'off',
         'no-control-regex': 0,
+        'import/no-duplicates': ["error", {"considerQueryString": true}],
         'simple-import-sort/imports': [
           'error',
           {
diff --git a/front/src/modules/settings/data-model/objects/__stories__/SettingsObjectDisabledMenuDropDown.stories.tsx b/front/src/modules/settings/data-model/objects/__stories__/SettingsObjectDisabledMenuDropDown.stories.tsx
index e8ab519498..19c765a77d 100644
--- a/front/src/modules/settings/data-model/objects/__stories__/SettingsObjectDisabledMenuDropDown.stories.tsx
+++ b/front/src/modules/settings/data-model/objects/__stories__/SettingsObjectDisabledMenuDropDown.stories.tsx
@@ -1,5 +1,4 @@
-import { expect } from '@storybook/jest';
-import { jest } from '@storybook/jest';
+import { expect, jest } from '@storybook/jest';
 import { Decorator, Meta, StoryObj } from '@storybook/react';
 import { userEvent, within } from '@storybook/testing-library';
 
diff --git a/front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx b/front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx
index 858b498c6b..6c58e7bc87 100644
--- a/front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx
+++ b/front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx
@@ -13,8 +13,7 @@ import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpre
 import { Fields } from '@/spreadsheet-import/types';
 import { IconChevronDown, IconForbid } from '@/ui/display/icon';
 
-import { Column, Columns } from '../MatchColumnsStep';
-import { ColumnType } from '../MatchColumnsStep';
+import { Column, Columns, ColumnType } from '../MatchColumnsStep';
 
 import { SubMatchingSelect } from './SubMatchingSelect';
 
diff --git a/front/src/modules/ui/navigation/link/components/__stories__/RawLink.stories.tsx b/front/src/modules/ui/navigation/link/components/__stories__/RawLink.stories.tsx
index d7fd48f17f..0bc23699f8 100644
--- a/front/src/modules/ui/navigation/link/components/__stories__/RawLink.stories.tsx
+++ b/front/src/modules/ui/navigation/link/components/__stories__/RawLink.stories.tsx
@@ -1,5 +1,4 @@
-import { expect } from '@storybook/jest';
-import { jest } from '@storybook/jest';
+import { expect, jest } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
 import { userEvent, within } from '@storybook/testing-library';
 
diff --git a/front/src/modules/ui/navigation/link/components/__stories__/RoundedLink.stories.tsx b/front/src/modules/ui/navigation/link/components/__stories__/RoundedLink.stories.tsx
index 2ebe3594c5..5a26b0556c 100644
--- a/front/src/modules/ui/navigation/link/components/__stories__/RoundedLink.stories.tsx
+++ b/front/src/modules/ui/navigation/link/components/__stories__/RoundedLink.stories.tsx
@@ -1,5 +1,4 @@
-import { expect } from '@storybook/jest';
-import { jest } from '@storybook/jest';
+import { expect, jest } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
 import { userEvent, within } from '@storybook/testing-library';
 
diff --git a/front/src/modules/ui/navigation/link/components/__stories__/SocialLink.stories.tsx b/front/src/modules/ui/navigation/link/components/__stories__/SocialLink.stories.tsx
index 3cc25719d8..f05cde4195 100644
--- a/front/src/modules/ui/navigation/link/components/__stories__/SocialLink.stories.tsx
+++ b/front/src/modules/ui/navigation/link/components/__stories__/SocialLink.stories.tsx
@@ -1,5 +1,4 @@
-import { expect } from '@storybook/jest';
-import { jest } from '@storybook/jest';
+import { expect, jest } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
 import { userEvent, within } from '@storybook/testing-library';
 
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
index 0a5c1c1b50..bbb60739cd 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
@@ -1,6 +1,5 @@
 import { useEffect } from 'react';
-import { jest } from '@storybook/jest';
-import { expect } from '@storybook/jest';
+import { expect, jest } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
 import { userEvent, within } from '@storybook/testing-library';
 
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx
index 6a2e02d0e5..4e4b2c0814 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx
@@ -1,6 +1,5 @@
 import { useEffect } from 'react';
-import { expect } from '@storybook/jest';
-import { jest } from '@storybook/jest';
+import { expect, jest } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
 import { userEvent, within } from '@storybook/testing-library';
 
diff --git a/server/.eslintrc.js b/server/.eslintrc.js
index 12c42c1f80..a4ad35d634 100644
--- a/server/.eslintrc.js
+++ b/server/.eslintrc.js
@@ -74,6 +74,7 @@ module.exports = {
         pathGroupsExcludedImportTypes: ['@nestjs/**'],
       },
     ],
+    'import/no-duplicates': ["error", {"considerQueryString": true}],
     'unused-imports/no-unused-imports': 'warn',
     "@typescript-eslint/consistent-type-imports": ["error", { "prefer": "no-type-imports" }],
   },
diff --git a/server/src/core/favorite/resolvers/favorite.resolver.ts b/server/src/core/favorite/resolvers/favorite.resolver.ts
index 664086eaa1..2c6b05ecb6 100644
--- a/server/src/core/favorite/resolvers/favorite.resolver.ts
+++ b/server/src/core/favorite/resolvers/favorite.resolver.ts
@@ -1,7 +1,12 @@
-import { Resolver, Query, Args, Mutation } from '@nestjs/graphql';
+import {
+  Resolver,
+  Query,
+  Args,
+  Mutation,
+  InputType,
+  Field,
+} from '@nestjs/graphql';
 import { UseGuards } from '@nestjs/common';
-import { InputType } from '@nestjs/graphql';
-import { Field } from '@nestjs/graphql';
 
 import { Prisma, Workspace } from '@prisma/client';