diff --git a/src/PowderCoating.Web/Views/Jobs/Index.cshtml b/src/PowderCoating.Web/Views/Jobs/Index.cshtml
index 4955d33..1074efd 100644
--- a/src/PowderCoating.Web/Views/Jobs/Index.cshtml
+++ b/src/PowderCoating.Web/Views/Jobs/Index.cshtml
@@ -162,10 +162,20 @@
             <div class="text-center py-5">
                 <i class="bi bi-inbox" style="font-size: 4rem; color: #d1d5db;"></i>
                 <h5 class="mt-3 text-muted">No jobs found</h5>
-                <p class="text-muted mb-4">Get started by creating your first job</p>
-                <a asp-action="Create" class="btn btn-primary">
-                    <i class="bi bi-plus-circle me-2"></i>Create Your First Job
-                </a>
+                @if (_allCount > 0)
+                {
+                    <p class="text-muted mb-4">No jobs match your current filter.</p>
+                    <a href="@Url.Action("Index", new { statusGroup = "active" })" class="btn btn-outline-secondary">
+                        <i class="bi bi-x-circle me-2"></i>Clear Filters
+                    </a>
+                }
+                else
+                {
+                    <p class="text-muted mb-4">Get started by creating your first job.</p>
+                    <a asp-action="Create" class="btn btn-primary">
+                        <i class="bi bi-plus-circle me-2"></i>Create Your First Job
+                    </a>
+                }
             </div>
         }
         else
@@ -328,10 +338,20 @@
                     <div class="text-center py-5">
                         <i class="bi bi-inbox" style="font-size: 4rem; color: #d1d5db;"></i>
                         <h5 class="mt-3 text-muted">No jobs found</h5>
-                        <p class="text-muted mb-4">Get started by creating your first job</p>
-                        <a asp-action="Create" class="btn btn-primary">
-                            <i class="bi bi-plus-circle me-2"></i>Create Your First Job
-                        </a>
+                        @if (_allCount > 0)
+                        {
+                            <p class="text-muted mb-4">No jobs match your current filter.</p>
+                            <a href="@Url.Action("Index", new { statusGroup = "active" })" class="btn btn-outline-secondary">
+                                <i class="bi bi-x-circle me-2"></i>Clear Filters
+                            </a>
+                        }
+                        else
+                        {
+                            <p class="text-muted mb-4">Get started by creating your first job.</p>
+                            <a asp-action="Create" class="btn btn-primary">
+                                <i class="bi bi-plus-circle me-2"></i>Create Your First Job
+                            </a>
+                        }
                     </div>
                 }
                 else
diff --git a/src/PowderCoating.Web/Views/Quotes/Index.cshtml b/src/PowderCoating.Web/Views/Quotes/Index.cshtml
index a7f3279..9dc3da6 100644
--- a/src/PowderCoating.Web/Views/Quotes/Index.cshtml
+++ b/src/PowderCoating.Web/Views/Quotes/Index.cshtml
@@ -294,9 +294,9 @@
             <div class="text-center py-5">
                 <i class="bi bi-file-text" style="font-size: 4rem; color: #ccc;"></i>
                 <p class="text-muted mt-3">No quotes found.</p>
-                @if (!string.IsNullOrEmpty(searchTerm) || statusFilter.HasValue)
+                @if (!string.IsNullOrEmpty(searchTerm) || statusFilter.HasValue || !string.IsNullOrEmpty(statusCode) || !string.IsNullOrEmpty(ViewBag.TagFilter as string))
                 {
-                    <p class="text-muted">Try adjusting your filters or <a asp-action="Index" asp-controller="Quotes">view all quotes</a>.</p>
+                    <p class="text-muted">No quotes match your current filter. <a asp-action="Index" asp-controller="Quotes">View all quotes</a>.</p>
                 }
                 else
                 {