diff --git a/frontend/src/app/components/containers/complaints/complaint-list.tsx b/frontend/src/app/components/containers/complaints/complaint-list.tsx
index 187770ed6..1334081af 100644
--- a/frontend/src/app/components/containers/complaints/complaint-list.tsx
+++ b/frontend/src/app/components/containers/complaints/complaint-list.tsx
@@ -198,6 +198,15 @@ export const ComplaintList: FC<Props> = ({ type, searchQuery }) => {
     }
   };
 
+  const renderNoComplaintsFound = () => {
+    return (
+      <td colSpan={11}>
+        <i className="bi bi-info-circle-fill"></i>
+        <span>No complaints found using your current filters. Remove or change your filters to see complaints.</span>
+      </td>
+    );
+  };
+
   return (
     <div className="comp-table-container">
       <div
@@ -210,6 +219,7 @@ export const ComplaintList: FC<Props> = ({ type, searchQuery }) => {
         >
           {renderComplaintListHeader(type)}
           <tbody>
+            {totalComplaints === 0 && renderNoComplaintsFound()}
             {complaints.map((item) => {
               const { id } = item;
 
diff --git a/frontend/src/app/components/mapping/leaflet-map-with-multiple-points.tsx b/frontend/src/app/components/mapping/leaflet-map-with-multiple-points.tsx
index 5354c8113..b5018e2d2 100644
--- a/frontend/src/app/components/mapping/leaflet-map-with-multiple-points.tsx
+++ b/frontend/src/app/components/mapping/leaflet-map-with-multiple-points.tsx
@@ -84,7 +84,7 @@ const LeafletMapWithMultiplePoints: React.FC<MapProps> = ({ complaintType, marke
       const info =
         unmappedComplaints >= 1
           ? `${unmappedComplaints} complaint${isPluralized} could not be mapped`
-          : "No complaints found.";
+          : "No complaints found using your current filters. Remove or change your filters to see complaints.";
 
       return (
         <Alert