diff --git a/apps/frontend/src/lib/components/blocks/base/duplicate-base.svelte b/apps/frontend/src/lib/components/blocks/base/duplicate-base.svelte
index 06cb9506f..70c7953d0 100644
--- a/apps/frontend/src/lib/components/blocks/base/duplicate-base.svelte
+++ b/apps/frontend/src/lib/components/blocks/base/duplicate-base.svelte
@@ -108,12 +108,7 @@
         >
           Cancel
         </Button>
-        <Form.Button
-          disabled={$duplicateBaseMutation.isPending}
-          on:click={() => {
-            $duplicateBaseMutation.mutate({ id: base.id })
-          }}
-        >
+        <Form.Button disabled={$duplicateBaseMutation.isPending}>
           {#if $duplicateBaseMutation.isPending}
             <LoaderCircleIcon class="mr-2 h-5 w-5 animate-spin" />
           {/if}
diff --git a/apps/frontend/src/lib/components/blocks/duplicate-table/duplicate-table.svelte b/apps/frontend/src/lib/components/blocks/duplicate-table/duplicate-table.svelte
index 658399694..45e9950a4 100644
--- a/apps/frontend/src/lib/components/blocks/duplicate-table/duplicate-table.svelte
+++ b/apps/frontend/src/lib/components/blocks/duplicate-table/duplicate-table.svelte
@@ -15,13 +15,14 @@
   import { Input } from "$lib/components/ui/input"
   import { Checkbox } from "$lib/components/ui/checkbox"
   import * as Alert from "$lib/components/ui/alert"
+  import { getTable } from "$lib/store/table.store"
 
-  export let table: TableDo
+  const table = getTable()
 
   const form = superForm(
     defaults(
       {
-        tableId: table.id.value,
+        tableId: $table.id.value,
         name: "",
         includeData: true,
       },
@@ -68,9 +69,9 @@
 >
   <Dialog.Content>
     <Dialog.Header>
-      <Dialog.Title>Duplicate Table {table.name.value}</Dialog.Title>
+      <Dialog.Title>Duplicate Table {$table.name.value}</Dialog.Title>
       <Dialog.Description>
-        Create a new table with the same structure as {table.name.value}
+        Create a new table with the same structure as {$table.name.value}
       </Dialog.Description>
     </Dialog.Header>
 
diff --git a/apps/frontend/src/lib/components/blocks/table-header/table-header.svelte b/apps/frontend/src/lib/components/blocks/table-header/table-header.svelte
index 424d4aec8..80d4feb07 100644
--- a/apps/frontend/src/lib/components/blocks/table-header/table-header.svelte
+++ b/apps/frontend/src/lib/components/blocks/table-header/table-header.svelte
@@ -279,4 +279,4 @@
   </div>
 </header>
 
-<DuplicateTable table={$table} />
+<DuplicateTable />