diff --git a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
index f7a55b1..2a23126 100644
--- a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
+++ b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
@@ -13,7 +13,7 @@ resource "datadog_monitor" "apimgt_status" {
   message = "${var.message}"
 
   query = <<EOF
-      avg(last_5m):avg:azure.apimanagement_service.status{${data.template_file.filter.rendered}} by {name,resource_group,region} < 1
+      avg(last_5m):avg:azure.apimanagement_service.status{${data.template_file.filter.rendered}} by {resource_group,region,name} < 1
       EOF
   type  = "metric alert"
 
@@ -40,10 +40,9 @@ resource "datadog_monitor" "apimgt_failed_requests" {
   message = "${var.message}"
 
   query = <<EOF
-    avg(last_5m): (
-      avg:azure.apimanagement_service.failed_requests{${data.template_file.filter.rendered}} * 100 /
-      avg:azure.apimanagement_service.total_requests{${data.template_file.filter.rendered}}
-      by {name,resource_group,region}
+    sum(last_5m): (
+      avg:azure.apimanagement_service.failed_requests{${data.template_file.filter.rendered}} by {resource_group,region,name}.as_count() /
+      avg:azure.apimanagement_service.total_requests{${data.template_file.filter.rendered}} by {resource_group,region,name}.as_count() * 100
     ) > ${var.failed_requests_threshold_critical}
     EOF
 
@@ -71,10 +70,9 @@ resource "datadog_monitor" "apimgt_other_requests" {
   message = "${var.message}"
 
   query = <<EOF
-    avg(last_5m): (
-      avg:azure.apimanagement_service.other_requests{${data.template_file.filter.rendered}} * 100 /
-      avg:azure.apimanagement_service.total_requests{${data.template_file.filter.rendered}}
-      by {name,resource_group,region}
+    sum(last_5m): (
+      avg:azure.apimanagement_service.other_requests{${data.template_file.filter.rendered}} by {resource_group,region,name}.as_count() /
+      avg:azure.apimanagement_service.total_requests{${data.template_file.filter.rendered}} by {resource_group,region,name}.as_count() * 100
     ) > ${var.other_requests_threshold_critical}
     EOF
 
@@ -102,10 +100,9 @@ resource "datadog_monitor" "apimgt_unauthorized_requests" {
   message = "${var.message}"
 
   query = <<EOF
-    avg(last_5m): (
-      avg:azure.apimanagement_service.failed_requests{${data.template_file.filter.rendered}} * 100 /
-      avg:azure.apimanagement_service.total_requests{${data.template_file.filter.rendered}}
-      by {name,resource_group,region}
+    sum(last_5m): (
+      avg:azure.apimanagement_service.unauthorized_requests{${data.template_file.filter.rendered}} by {resource_group,region,name}.as_count() /
+      avg:azure.apimanagement_service.total_requests{${data.template_file.filter.rendered}} by {resource_group,region,name}.as_count() * 100
     ) > ${var.unauthorized_requests_threshold_critical}
     EOF
 
@@ -133,10 +130,9 @@ resource "datadog_monitor" "apimgt_successful_requests" {
   message = "${var.message}"
 
   query = <<EOF
-    avg(last_5m): (
-      avg:azure.apimanagement_service.successful_requests{${data.template_file.filter.rendered}} * 100 /
-      avg:azure.apimanagement_service.total_requests{${data.template_file.filter.rendered}}
-      by {name,resource_group,region}
+    sum(last_5m): (
+      avg:azure.apimanagement_service.successful_requests{${data.template_file.filter.rendered}} by {resource_group,region,name}.as_count() /
+      avg:azure.apimanagement_service.total_requests{${data.template_file.filter.rendered}} by {resource_group,region,name}.as_count() * 100
     ) < ${var.successful_requests_threshold_critical}
     EOF
 
@@ -145,7 +141,7 @@ resource "datadog_monitor" "apimgt_successful_requests" {
   }
 
   type                = "metric alert"
-  notify_no_data      = true
+  notify_no_data      = false
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true