diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 92d42183..f1931337 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -353,7 +353,7 @@ export default function Table({
           }}
         >
           <TableHeader
-            table={table}
+            headerGroups={table.getHeaderGroups()}
             handleDropColumn={handleDropColumn}
             canAddColumns={canAddColumns}
             canEditColumns={canEditColumns}
diff --git a/src/components/Table/TableBody.tsx b/src/components/Table/TableBody.tsx
index 30361ed6..04918f18 100644
--- a/src/components/Table/TableBody.tsx
+++ b/src/components/Table/TableBody.tsx
@@ -54,7 +54,7 @@ export interface ITableBodyProps {
  * - Renders row out of order indicator
  * - Renders next page loading UI (`RowsSkeleton`)
  */
-export const TableBody = function TableBody({
+export const TableBody = memo(function TableBody({
   containerRef,
   leafColumns,
   rows,
@@ -157,6 +157,6 @@ export const TableBody = function TableBody({
       )}
     </div>
   );
-};
+});
 
 export default TableBody;
diff --git a/src/components/Table/TableHeader.tsx b/src/components/Table/TableHeader.tsx
index 2064d538..ae763a60 100644
--- a/src/components/Table/TableHeader.tsx
+++ b/src/components/Table/TableHeader.tsx
@@ -2,7 +2,11 @@ import { memo, Fragment } from "react";
 import { useAtom } from "jotai";
 import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
 import type { DropResult } from "react-beautiful-dnd";
-import { ColumnSizingState, Table, flexRender } from "@tanstack/react-table";
+import {
+  ColumnSizingState,
+  HeaderGroup,
+  flexRender,
+} from "@tanstack/react-table";
 import type { TableRow } from "@src/types/table";
 
 import StyledRow from "./Styled/StyledRow";
@@ -15,7 +19,7 @@ import StyledColumnHeader from "./Styled/StyledColumnHeader";
 
 export interface ITableHeaderProps {
   /** Headers with context from TanStack Table state */
-  table: Table<TableRow>;
+  headerGroups: HeaderGroup<TableRow>[];
   /** Called when a header is dropped in a new position */
   handleDropColumn: (result: DropResult) => void;
   /** Passed to `FinalColumnHeader` */
@@ -35,14 +39,13 @@ export interface ITableHeaderProps {
  *
  * - Renders drag & drop components
  */
-export const TableHeader = function TableHeader({
-  table,
+export const TableHeader = memo(function TableHeader({
+  headerGroups,
   handleDropColumn,
   canAddColumns,
   canEditColumns,
   lastFrozen,
 }: ITableHeaderProps) {
-  const headerGroups = table.getHeaderGroups();
   const [selectedCell] = useAtom(selectedCellAtom, tableScope);
   const focusInside = selectedCell?.focusInside ?? false;
 
@@ -145,6 +148,6 @@ export const TableHeader = function TableHeader({
       ))}
     </DragDropContext>
   );
-};
+});
 
 export default TableHeader;