diff --git a/src/lib/components/csvExportBox.svelte b/src/lib/components/csvExportBox.svelte
index ab6689121..2d6ad2994 100644
--- a/src/lib/components/csvExportBox.svelte
+++ b/src/lib/components/csvExportBox.svelte
@@ -131,7 +131,9 @@
 
         switch (status) {
             case 'completed':
-                downloadExportedFile(downloadUrl);
+                if (downloadUrl) {
+                    downloadExportedFile(downloadUrl);
+                }
                 break;
             case 'failed':
                 await showCompletionNotification(
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 839b8a6b2..93d908097 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
@@ -146,7 +146,7 @@
                 table: page.params.table
             }
         );
-        return queryParam ? `${url}?query=${queryParam}` : url;
+        return queryParam ? `${url}?query=${encodeURIComponent(queryParam)}` : url;
     }
 
     onDestroy(() => ($showCreateColumnSheet.show = false));
@@ -224,7 +224,8 @@
                                     size="s"
                                     secondary
                                     class="small-button-dimensions"
-                                    disabled={!(hasColumns && hasValidColumns && data.rows.total) || disableButton}
+                                    disabled={!(hasColumns && hasValidColumns && data.rows.total) ||
+                                        disableButton}
                                     on:click={() => {
                                         trackEvent(Click.DatabaseExportCsv);
                                         goto(getTableExportUrl());
@@ -430,6 +431,7 @@
 
     :global(.rotating) {
         animation: rotate 1s linear infinite;
+        animation-direction: reverse;
     }
 
     @keyframes rotate {