diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyState.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyState.tsx
index cf694d526..a84b6164d 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyState.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyState.tsx
@@ -1,7 +1,5 @@
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { hasRecordGroupsComponentSelector } from '@/object-record/record-group/states/selectors/hasRecordGroupsComponentSelector';
 import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
-import { RecordTableEmptyStateByGroupNoRecordAtAll } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateByGroupNoRecordAtAll';
 import { RecordTableEmptyStateNoGroupNoRecordAtAll } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateNoGroupNoRecordAtAll';
 import { RecordTableEmptyStateNoRecordFoundForFilter } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateNoRecordFoundForFilter';
 import { RecordTableEmptyStateReadOnly } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateReadOnly';
@@ -15,10 +13,6 @@ export const RecordTableEmptyState = () => {
   const { recordTableId, objectNameSingular, objectMetadataItem } =
     useRecordTableContextOrThrow();
 
-  const hasRecordGroups = useRecoilComponentValueV2(
-    hasRecordGroupsComponentSelector,
-  );
-
   const hasObjectReadOnlyPermission = useHasObjectReadOnlyPermission();
 
   const { totalCount } = useFindManyRecords({ objectNameSingular, limit: 1 });
@@ -40,10 +34,6 @@ export const RecordTableEmptyState = () => {
   } else if (isSoftDeleteActive === true) {
     return <RecordTableEmptyStateSoftDelete />;
   } else if (noRecordAtAll) {
-    if (hasRecordGroups) {
-      return <RecordTableEmptyStateByGroupNoRecordAtAll />;
-    }
-
     return <RecordTableEmptyStateNoGroupNoRecordAtAll />;
   } else {
     return <RecordTableEmptyStateNoRecordFoundForFilter />;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateByGroupNoRecordAtAll.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateByGroupNoRecordAtAll.tsx
deleted file mode 100644
index bbc2c3074..000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateByGroupNoRecordAtAll.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { useObjectLabel } from '@/object-metadata/hooks/useObjectLabel';
-import { RecordIndexAddRecordInGroupDropdown } from '@/object-record/record-index/components/RecordIndexAddRecordInGroupDropdown';
-import { recordIndexRecordGroupHideComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordGroupHideComponentFamilyState';
-import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
-import { RecordTableEmptyStateDisplay } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay';
-import { getEmptyStateSubTitle } from '@/object-record/record-table/empty-state/utils/getEmptyStateSubTitle';
-import { getEmptyStateTitle } from '@/object-record/record-table/empty-state/utils/getEmptyStateTitle';
-import { useSetRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentFamilyStateV2';
-import { ViewType } from '@/views/types/ViewType';
-import { Button } from 'twenty-ui/input';
-import { IconPlus } from 'twenty-ui/display';
-
-export const RecordTableEmptyStateByGroupNoRecordAtAll = () => {
-  const { objectMetadataItem } = useRecordTableContextOrThrow();
-
-  const setHideEmptyRecordGroup = useSetRecoilComponentFamilyStateV2(
-    recordIndexRecordGroupHideComponentFamilyState,
-    ViewType.Table,
-  );
-
-  const objectLabel = useObjectLabel(objectMetadataItem);
-
-  const buttonTitle = `Add a ${objectLabel}`;
-
-  const title = getEmptyStateTitle(
-    objectMetadataItem.nameSingular,
-    objectLabel,
-  );
-
-  const subTitle = getEmptyStateSubTitle(
-    objectMetadataItem.nameSingular,
-    objectLabel,
-  );
-
-  const handleButtonClick = () => {
-    // When we have no records in the group, we want to show the empty state
-    setHideEmptyRecordGroup(false);
-  };
-
-  return (
-    <RecordTableEmptyStateDisplay
-      title={title}
-      subTitle={subTitle}
-      animatedPlaceholderType="noRecord"
-      buttonComponent={
-        <RecordIndexAddRecordInGroupDropdown
-          dropdownId="record-table-empty-state-add-button-dropdown"
-          clickableComponent={
-            <Button
-              Icon={IconPlus}
-              title={buttonTitle}
-              variant={'secondary'}
-              onClick={handleButtonClick}
-            />
-          }
-        />
-      }
-    />
-  );
-};