diff --git a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveAnnotationHandler.cs b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveAnnotationHandler.cs
index bb3cb868..6829b751 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveAnnotationHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveAnnotationHandler.cs
@@ -28,6 +28,7 @@ public class RemoveAnnotationHandler : INotificationHandler<RemoveSignatureNotif
     /// <returns></returns>
     public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
     {
+        notification.ThrowIfHasNoFilter();
         return _repo.DeleteAsync(annots =>
         {
             // envelope ID filter
diff --git a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveDocStatusHandler.cs b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveDocStatusHandler.cs
index 54668dda..f750c9b3 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveDocStatusHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveDocStatusHandler.cs
@@ -28,6 +28,7 @@ public class RemoveDocStatusHandler : INotificationHandler<RemoveSignatureNotifi
     /// <returns></returns>
     public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
     {
+        notification.ThrowIfHasNoFilter();
         return _repo.DeleteAsync(statuses =>
         {
             // envelope ID filter
diff --git a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveHistoryHandler.cs b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveHistoryHandler.cs
index 4ba5103f..384d16fd 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveHistoryHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveHistoryHandler.cs
@@ -29,6 +29,7 @@ public class RemoveHistoryHandler : INotificationHandler<RemoveSignatureNotifica
     /// <returns></returns>
     public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
     {
+        notification.ThrowIfHasNoFilter();
         return _repo.DeleteAsync(hists =>
         {
             hists = hists.Where(hist => hist.Status == EnvelopeStatus.DocumentSigned);