diff --git a/packages/client/src/components/DataTable/DataTableComponents.tsx b/packages/client/src/components/DataTable/DataTableComponents.tsx
index 699bcf7467..96474aaa11 100644
--- a/packages/client/src/components/DataTable/DataTableComponents.tsx
+++ b/packages/client/src/components/DataTable/DataTableComponents.tsx
@@ -2,7 +2,9 @@ import { memo } from 'react';
 import { flexRender } from '@tanstack/react-table';
 import type { Row, ColumnDef } from '@tanstack/react-table';
 import type { TableColumn } from './DataTable.types';
-import { Checkbox, TableCell, TableRow, Skeleton } from '~/components';
+import { TableCell, TableRow } from '../Table';
+import { Checkbox } from '../Checkbox';
+import { Skeleton } from '../Skeleton';
 import { cn } from '~/utils';
 
 export const SelectionCheckbox = memo(
diff --git a/packages/client/src/components/DataTable/DataTableSearch.tsx b/packages/client/src/components/DataTable/DataTableSearch.tsx
index 1d64943827..277a257d13 100644
--- a/packages/client/src/components/DataTable/DataTableSearch.tsx
+++ b/packages/client/src/components/DataTable/DataTableSearch.tsx
@@ -1,8 +1,8 @@
 import { memo } from 'react';
 import { startTransition } from 'react';
 import type { DataTableSearchProps } from './DataTable.types';
-import { Input } from '~/components';
 import { useLocalize } from '~/hooks';
+import { Input } from '../Input';
 import { cn } from '~/utils';
 
 export const DataTableSearch = memo(
diff --git a/packages/client/src/components/index.ts b/packages/client/src/components/index.ts
index 4457fe1e4c..d091ba69f2 100644
--- a/packages/client/src/components/index.ts
+++ b/packages/client/src/components/index.ts
@@ -4,7 +4,6 @@ export * from './AlertDialog';
 export * from './Breadcrumb';
 export * from './Button';
 export * from './Checkbox';
-export * from './DataTable/DataTable.types';
 
 export * from './Dialog';
 export * from './DropdownMenu';
@@ -46,7 +45,6 @@ export { default as DropdownPopup } from './DropdownPopup';
 export { default as DelayedRender } from './DelayedRender';
 export { default as ThemeSelector } from './ThemeSelector';
 export { default as InfoHoverCard } from './InfoHoverCard';
-export { default as DataTable } from './DataTable/DataTable';
 export { default as CheckboxButton } from './CheckboxButton';
 export { default as DialogTemplate } from './DialogTemplate';
 export { default as SelectDropDown } from './SelectDropDown';
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index 709697c99f..4c6c7d9df4 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -1,5 +1,7 @@
 // Components
 export * from './components';
+export { default as DataTable } from './components/DataTable/DataTable';
+export * from './components/DataTable/DataTable.types';
 
 // Hooks
 export * from './hooks';