diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysTable.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysTable.tsx
index de55bab79..9e8baaa89 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysTable.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsApiKeysTable.tsx
@@ -7,7 +7,7 @@ import { SettingsApiKeysFieldItemTableRow } from '@/settings/developers/componen
 import { ApiFieldItem } from '@/settings/developers/types/api-key/ApiFieldItem';
 import { ApiKey } from '@/settings/developers/types/api-key/ApiKey';
 import { formatExpirations } from '@/settings/developers/utils/format-expiration';
-import { Table } from '@/spreadsheet-import/components/Table';
+import { Table } from '@/ui/layout/table/components/Table';
 import { TableBody } from '@/ui/layout/table/components/TableBody';
 import { TableHeader } from '@/ui/layout/table/components/TableHeader';
 import { TableRow } from '@/ui/layout/table/components/TableRow';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/Table.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/Table.tsx
index cc3610d9c..3ee211eb1 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/Table.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/Table.tsx
@@ -126,6 +126,8 @@ export const Table = <Data,>({
 }: TableProps<Data>) => {
   const { rtl } = useSpreadsheetImportInternal();
 
+  if (!rows?.length || !columns?.length) return null;
+
   return (
     <StyledDataGrid
       direction={rtl ? 'rtl' : 'ltr'}