diff --git a/main/manager.c b/main/manager.c
index f6feb8e3079f5daa124018ec01525f81f655d4f3..76a6611a241fd2fb999e88cb86a72fb34d317c08 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -7234,7 +7234,7 @@ int __ast_manager_event_multichan(int category, const char *event, int chancount
 	int res;
 
 	if (!ast_strlen_zero(manager_disabledevents)) {
-		if (strstr(manager_disabledevents, event)) {
+		if (ast_in_delimited_string(event, manager_disabledevents, ',')) {
 			ast_debug(3, "AMI Event '%s' is globally disabled, skipping\n", event);
 			/* Event is globally disabled */
 			ao2_cleanup(sessions);