diff --git a/webgis/js/controllers/search_controller.js b/webgis/js/controllers/search_controller.js
index 55dfd43..157895a 100644
--- a/webgis/js/controllers/search_controller.js
+++ b/webgis/js/controllers/search_controller.js
@@ -49,6 +49,18 @@ export default class extends Controller {
         const results = await response.json(); 
 
         this.containerTarget.classList.remove('is-hidden');
+
+        if (results.count === 0) {
+            // Restore all layer groups
+            for (const key of Object.keys(GisState.layers)) {
+                map.addLayer(GisState.layers[key]);
+            }
+            this.resultsTarget.innerHTML = html`
+                <p class="has-background-white-bis p-4 mt-0 has-text-centered">
+                    Nessun risultato trovato per i parametri di ricerca
+                </p>
+            `;
+        }
         if (results.count) {
             this.#injectResults(results);
             // Reset zoom level after successful search
@@ -91,14 +103,6 @@ export default class extends Controller {
         const output = this.resultsTarget;
         output.innerHTML = '';
 
-        if (results.count === 0) {
-            output.innerHTML = html`
-                <p class="has-background-white-bis p-4 mt-0 has-text-centered">
-                    Nessun risultato trovato per i parametri di ricerca
-                </p>
-            `;
-        }
-
         delete results.count;
 
         for (const group of Object.keys(results)) {