diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/(certificates)/disabledPage.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/(certificates)/disabledPage.svelte
index 34d276f00..40b2d2340 100644
--- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/(certificates)/disabledPage.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/(certificates)/disabledPage.svelte
@@ -141,7 +141,7 @@
             offset={data.offset}
             total={data.certificates.total} />
     {:else if data?.search}
-        <EmptySearch hidePages bind:search={data.search} target="certificates">
+        <EmptySearch hidePages search={data.search} target="certificates">
             <svelte:fragment slot="actions">
                 <Button secondary on:click={clearSearch}>Clear search</Button>
             </svelte:fragment>
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte
index f60842ce3..c1ddc4c82 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte
@@ -9,14 +9,15 @@
     import SearchQuery from '$lib/components/searchQuery.svelte';
     import { app } from '$lib/stores/app';
     import { Click, trackEvent } from '$lib/actions/analytics';
+    import { clearSearchInput } from '$lib/helpers/clearSearch';
     import Table from './table.svelte';
 
     export let data;
 
-    let searchQuery;
+    let searchQuery: { clearInput?: () => void } | undefined;
 
     function clearSearch() {
-        searchQuery?.clearInput();
+        clearSearchInput(searchQuery);
     }
 </script>
 
@@ -44,7 +45,7 @@
             offset={data.offset}
             total={data.proxyRules.total} />
     {:else if data?.search}
-        <EmptySearch hidePages bind:search={data.search} target="domains" hidePagination>
+        <EmptySearch hidePages search={data.search} target="domains" hidePagination>
             <Button secondary on:click={clearSearch}>Clear search</Button>
         </EmptySearch>
     {:else}