diff --git a/templates/partials/gear_list.html b/templates/partials/gear_list.html
index c4d4cf2..a293569 100644
--- a/templates/partials/gear_list.html
+++ b/templates/partials/gear_list.html
@@ -1,7 +1,7 @@
 {% import "partials/table.html" as table %}
 
 <div id="gear-list">
-  {% if gear.items.is_empty() %}
+  {% if gear.items.is_empty() && !navigator.has_search() %}
   <div class="rounded-lg border border-stone-200 bg-stone-50 p-8 text-center">
     <p class="text-stone-500">No gear found.</p>
     {% if is_authenticated %}
@@ -64,6 +64,9 @@
         </tbody>
       </table>
     </div>
+    {% if gear.items.is_empty() %}
+    <div class="p-8 text-center text-stone-500">No gear matches your search.</div>
+    {% endif %}
     {% call table::pagination_header(gear, navigator, "#gear-list") %}
     {% if gear.has_next() %}
     <div class="infinite-scroll-sentinel h-4" aria-hidden="true"></div>
diff --git a/templates/partials/roast_list.html b/templates/partials/roast_list.html
index 1cae4bd..cb91aa3 100644
--- a/templates/partials/roast_list.html
+++ b/templates/partials/roast_list.html
@@ -1,7 +1,7 @@
 {% import "partials/table.html" as table %}
 
 <div id="roast-list" class="mt-6" data-star-scope="roasts">
-  {% if roasts.items.is_empty() %}
+  {% if roasts.items.is_empty() && !navigator.has_search() %}
   <div
     class="rounded-lg border border-dashed border-amber-300 bg-amber-100/40 px-4 py-6 text-sm text-stone-600"
   >
@@ -88,6 +88,9 @@
         </tbody>
       </table>
     </div>
+    {% if roasts.items.is_empty() %}
+    <div class="p-8 text-center text-stone-500">No roasts match your search.</div>
+    {% endif %}
     {% call table::pagination_header(roasts, navigator, "#roast-list") %}
     {% if roasts.has_next() %}
     <div class="infinite-scroll-sentinel h-4" aria-hidden="true"></div>
diff --git a/templates/partials/roaster_list.html b/templates/partials/roaster_list.html
index 418d645..4f0e5fe 100644
--- a/templates/partials/roaster_list.html
+++ b/templates/partials/roaster_list.html
@@ -1,7 +1,7 @@
 {% import "partials/table.html" as table %}
 
 <div id="roaster-list" class="mt-6" data-star-scope="roasters">
-  {% if roasters.items.is_empty() %}
+  {% if roasters.items.is_empty() && !navigator.has_search() %}
   <div
     class="rounded-lg border border-dashed border-amber-300 bg-amber-100/40 px-4 py-6 text-sm text-stone-600"
   >
@@ -100,6 +100,9 @@
         </tbody>
       </table>
     </div>
+    {% if roasters.items.is_empty() %}
+    <div class="p-8 text-center text-stone-500">No roasters match your search.</div>
+    {% endif %}
     {% call table::pagination_header(roasters, navigator, "#roaster-list") %}
     {% if roasters.has_next() %}
     <div class="infinite-scroll-sentinel h-4" aria-hidden="true"></div>