diff --git a/ogcp/templates/actions/client_search.html b/ogcp/templates/actions/client_search.html
index 3a0bfb7..c5ad47e 100644
--- a/ogcp/templates/actions/client_search.html
+++ b/ogcp/templates/actions/client_search.html
@@ -56,6 +56,12 @@
     const nameFilter = document.getElementById('name-filter').value.toLowerCase();
     const ipFilter = document.getElementById('ip-filter').value;
 
+    // If both filters are empty, don't display any clients
+    if (!nameFilter && !ipFilter) {
+      document.getElementById('clients-container').innerHTML = '';
+      return;
+    }
+
     const filtered = clients.filter(client => {
       const matchesName = nameFilter ? client.name.toLowerCase().includes(nameFilter) : true;
       const matchesIP = ipFilter ? client.ip.some(ip => ip.includes(ipFilter)) : true;
@@ -65,7 +71,7 @@
     renderClients(filtered);
   }
 
-  renderClients(clients);
+  filterClients();
   document.getElementById('search-button').addEventListener('click', filterClients);
 
   // Search on Enter key press