diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
index 58d0b370e..cb355e06a 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
@@ -186,9 +186,9 @@
                                 leadingIcon={IconDownload}
                                 on:click={() => {
                                     trackEvent(Click.DatabaseExportCsv);
-                                    goto(
-                                        `${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}/export`
-                                    );
+                                    const queryParam = page.url.searchParams.get('query');
+                                    const exportUrl = `${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}/export${queryParam ? `?query=${queryParam}` : ''}`;
+                                    goto(exportUrl);
                                 }}>
                                 Export CSV
                             </ActionMenu.Item.Button>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/export/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/export/+page.svelte
index 25ffd1bce..5117ab232 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/export/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/export/+page.svelte
@@ -139,9 +139,9 @@
 
             trackEvent(Submit.DatabaseExportCsv);
 
-            await goto(
-                `${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}`
-            );
+            const queryParam = page.url.searchParams.get('query');
+            const tableUrl = `${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}${queryParam ? `?query=${queryParam}` : ''}`;
+            await goto(tableUrl);
         } catch (error) {
             addNotification({
                 type: 'error',
@@ -161,7 +161,7 @@
 <Wizard
     title="Export CSV"
     columnSize="s"
-    href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}`}
+    href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}${page.url.searchParams.get('query') ? `?query=${page.url.searchParams.get('query')}` : ''}`}
     bind:showExitModal
     confirmExit
     column>