diff --git a/server/services/MonitorService.js b/server/services/MonitorService.js
index e45a7222e..4cd7b065b 100644
--- a/server/services/MonitorService.js
+++ b/server/services/MonitorService.js
@@ -318,6 +318,7 @@ export default class MonitorService {
           query: {
             bool: {
               should,
+              minimum_should_match: state !== 'all' ? 1 : 0,
               must: mustList,
             },
           },