diff --git a/src/components/Table.tsx b/src/components/Table.tsx
index 882c1fe1..cfd77df6 100644
--- a/src/components/Table.tsx
+++ b/src/components/Table.tsx
@@ -47,6 +47,7 @@ export interface TableProps<TData extends object> {
   emptyContent?: ReactNode;
   sorting?: SortingState;
   setSorting?: OnChangeFn<SortingState>;
+  manualSorting?: boolean;
 }
 
 const DUMMY_SKELETON_DATA = [{}, {}, {}, {}, {}];
@@ -84,6 +85,7 @@ const Table = <TData extends object>({
   emptyContent = emptyContentDefaultValue,
   sorting,
   setSorting,
+  manualSorting = false,
 }: TableProps<TData>) => {
   const isServerSideTable =
     totalItems !== undefined &&
@@ -111,11 +113,10 @@ const Table = <TData extends object>({
     getSortedRowModel: getSortedRowModel(),
     getPaginationRowModel: getPaginationRowModel(),
     onPaginationChange: setPagination,
-    onSortingChange: setSorting,
+    manualSorting,
     state: {
       pagination,
       globalFilter: fuzzySearchValue,
-      sorting,
     },
     filterFns: {
       fuzzy: fuzzyFilter,
@@ -128,6 +129,14 @@ const Table = <TData extends object>({
     tableOptions.getFilteredRowModel = getFilteredRowModel();
   }
 
+  if (sorting && setSorting) {
+    tableOptions.onSortingChange = setSorting;
+    tableOptions.state = {
+      ...tableOptions.state,
+      sorting,
+    };
+  }
+
   const table = useReactTable(tableOptions);
   const { setPageSize } = table;