diff --git a/web/src/elements/table/TablePage.ts b/web/src/elements/table/TablePage.ts
index bb7fb39b8..8a8d02688 100644
--- a/web/src/elements/table/TablePage.ts
+++ b/web/src/elements/table/TablePage.ts
@@ -9,6 +9,7 @@ import PFPage from "@patternfly/patternfly/components/Page/page.css";
 import PFSidebar from "@patternfly/patternfly/components/Sidebar/sidebar.css";
 
 import "../../elements/PageHeader";
+import { updateURLParams } from "../router/RouteMatch";
 import { Table } from "./Table";
 
 export abstract class TablePage<T> extends Table<T> {
@@ -33,11 +34,33 @@ export abstract class TablePage<T> extends Table<T> {
             ${inner
                 ? inner
                 : html`<ak-empty-state icon=${this.pageIcon()} header="${t`No objects found.`}">
-                      <div slot="body">${this.renderObjectCreate()}</div>
+                      <div slot="body">
+                          ${this.searchEnabled() ? this.renderEmptyClearSearch() : html``}
+                      </div>
+                      <div slot="primary">${this.renderObjectCreate()}</div>
                   </ak-empty-state>`}
         `);
     }
 
+    renderEmptyClearSearch(): TemplateResult {
+        if (this.search === "") {
+            return html``;
+        }
+        return html`<button
+            @click=${() => {
+                this.search = "";
+                this.requestUpdate();
+                this.fetch();
+                updateURLParams({
+                    search: "",
+                });
+            }}
+            class="pf-c-button pf-m-link"
+        >
+            ${t`Clear search`}
+        </button>`;
+    }
+
     renderObjectCreate(): TemplateResult {
         return html``;
     }
diff --git a/web/src/locales/de.po b/web/src/locales/de.po
index 76ffb7727..b39c9d2ba 100644
--- a/web/src/locales/de.po
+++ b/web/src/locales/de.po
@@ -944,6 +944,10 @@ msgstr "Cache löschen"
 msgid "Clear icon"
 msgstr "Symbol zurücksetzen"
 
+#: src/elements/table/TablePage.ts
+msgid "Clear search"
+msgstr ""
+
 #: src/elements/forms/HorizontalFormElement.ts
 msgid "Click to change value"
 msgstr "Klicken Sie, um den Wert zu ändern"
diff --git a/web/src/locales/en.po b/web/src/locales/en.po
index 9a3ce7546..a959df6f4 100644
--- a/web/src/locales/en.po
+++ b/web/src/locales/en.po
@@ -946,6 +946,10 @@ msgstr "Clear cache"
 msgid "Clear icon"
 msgstr "Clear icon"
 
+#: src/elements/table/TablePage.ts
+msgid "Clear search"
+msgstr "Clear search"
+
 #: src/elements/forms/HorizontalFormElement.ts
 msgid "Click to change value"
 msgstr "Click to change value"
diff --git a/web/src/locales/es.po b/web/src/locales/es.po
index 027a5c8db..c2fcddb18 100644
--- a/web/src/locales/es.po
+++ b/web/src/locales/es.po
@@ -934,6 +934,10 @@ msgstr "Limpiar caché"
 msgid "Clear icon"
 msgstr "Ícono Borrar"
 
+#: src/elements/table/TablePage.ts
+msgid "Clear search"
+msgstr ""
+
 #: src/elements/forms/HorizontalFormElement.ts
 msgid "Click to change value"
 msgstr "Haga clic para cambiar el valor"
diff --git a/web/src/locales/fr_FR.po b/web/src/locales/fr_FR.po
index 7a7c706c7..e266960da 100644
--- a/web/src/locales/fr_FR.po
+++ b/web/src/locales/fr_FR.po
@@ -942,6 +942,10 @@ msgstr "Vider le cach"
 msgid "Clear icon"
 msgstr "Supprimer l'icôn"
 
+#: src/elements/table/TablePage.ts
+msgid "Clear search"
+msgstr ""
+
 #: src/elements/forms/HorizontalFormElement.ts
 msgid "Click to change value"
 msgstr "Cliquer pour changer la valeur"
diff --git a/web/src/locales/pl.po b/web/src/locales/pl.po
index 63cd7f3c0..2f6ddb256 100644
--- a/web/src/locales/pl.po
+++ b/web/src/locales/pl.po
@@ -931,6 +931,10 @@ msgstr "Wyczyść pamięć podręczną"
 msgid "Clear icon"
 msgstr "Wyczyść ikonę"
 
+#: src/elements/table/TablePage.ts
+msgid "Clear search"
+msgstr ""
+
 #: src/elements/forms/HorizontalFormElement.ts
 msgid "Click to change value"
 msgstr "Kliknij, aby zmienić wartość"
diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po
index 066d8af16..f91646f0e 100644
--- a/web/src/locales/pseudo-LOCALE.po
+++ b/web/src/locales/pseudo-LOCALE.po
@@ -934,6 +934,10 @@ msgstr ""
 msgid "Clear icon"
 msgstr ""
 
+#: src/elements/table/TablePage.ts
+msgid "Clear search"
+msgstr ""
+
 #: src/elements/forms/HorizontalFormElement.ts
 msgid "Click to change value"
 msgstr ""
diff --git a/web/src/locales/tr.po b/web/src/locales/tr.po
index fc63807b8..940000416 100644
--- a/web/src/locales/tr.po
+++ b/web/src/locales/tr.po
@@ -934,6 +934,10 @@ msgstr "Önbelleği temizle"
 msgid "Clear icon"
 msgstr "Simgeyi temizle"
 
+#: src/elements/table/TablePage.ts
+msgid "Clear search"
+msgstr ""
+
 #: src/elements/forms/HorizontalFormElement.ts
 msgid "Click to change value"
 msgstr "Değeri değiştirmek için tıklayın"
diff --git a/web/src/locales/zh-Hans.po b/web/src/locales/zh-Hans.po
index 3ce550ea2..bb9d84794 100644
--- a/web/src/locales/zh-Hans.po
+++ b/web/src/locales/zh-Hans.po
@@ -930,6 +930,10 @@ msgstr "清除缓存"
 msgid "Clear icon"
 msgstr "清除图标"
 
+#: src/elements/table/TablePage.ts
+msgid "Clear search"
+msgstr ""
+
 #: src/elements/forms/HorizontalFormElement.ts
 msgid "Click to change value"
 msgstr "点击以更改值"
diff --git a/web/src/locales/zh-Hant.po b/web/src/locales/zh-Hant.po
index 641b0464c..b82d665c0 100644
--- a/web/src/locales/zh-Hant.po
+++ b/web/src/locales/zh-Hant.po
@@ -932,6 +932,10 @@ msgstr "清除缓存"
 msgid "Clear icon"
 msgstr "清除图标"
 
+#: src/elements/table/TablePage.ts
+msgid "Clear search"
+msgstr ""
+
 #: src/elements/forms/HorizontalFormElement.ts
 msgid "Click to change value"
 msgstr "单击以更改值"
diff --git a/web/src/locales/zh_TW.po b/web/src/locales/zh_TW.po
index 7d8965240..aed610050 100644
--- a/web/src/locales/zh_TW.po
+++ b/web/src/locales/zh_TW.po
@@ -932,6 +932,10 @@ msgstr "清除缓存"
 msgid "Clear icon"
 msgstr "清除图标"
 
+#: src/elements/table/TablePage.ts
+msgid "Clear search"
+msgstr ""
+
 #: src/elements/forms/HorizontalFormElement.ts
 msgid "Click to change value"
 msgstr "单击以更改值"