diff --git a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
index 19fa02f..63bd41d 100644
--- a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
+++ b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
@@ -133,10 +133,11 @@ resource "datadog_monitor" "apimgt_successful_requests" {
   message = "${coalesce(var.successful_requests_message, var.message)}"
 
   query = <<EOF
-    ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}): (
-      default(avg:azure.apimanagement_service.successful_requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 1) /
-      default(avg:azure.apimanagement_service.total_requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 1)
-    ) * 100 < ${var.successful_requests_threshold_critical}
+    ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
+    default( (
+      default(avg:azure.apimanagement_service.successful_requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) /
+      default(avg:azure.apimanagement_service.total_requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0)
+    ) * 100, 100) < ${var.successful_requests_threshold_critical}
   EOF
 
   thresholds {
diff --git a/cloud/azure/app-services/monitors-app_services.tf b/cloud/azure/app-services/monitors-app_services.tf
index a77a30f..a70fed5 100644
--- a/cloud/azure/app-services/monitors-app_services.tf
+++ b/cloud/azure/app-services/monitors-app_services.tf
@@ -141,7 +141,7 @@ resource "datadog_monitor" "appservices_http_success_status_rate" {
       (default(avg:azure.app_services.http2xx${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) +
       default(avg:azure.app_services.http3xx${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) ) /
       default(avg:azure.app_services.requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0)
-    ) * 100,100) < ${var.http_successful_requests_threshold_critical}
+    ) * 100, 100) < ${var.http_successful_requests_threshold_critical}
   EOF
 
   evaluation_delay = "${var.evaluation_delay}"
diff --git a/cloud/azure/keyvault/monitors-keyvault.tf b/cloud/azure/keyvault/monitors-keyvault.tf
index 9f87421..c5d5ad1 100644
--- a/cloud/azure/keyvault/monitors-keyvault.tf
+++ b/cloud/azure/keyvault/monitors-keyvault.tf
@@ -34,10 +34,11 @@ resource "datadog_monitor" "keyvault_api_result" {
   message = "${coalesce(var.status_message, var.message)}"
 
   query = <<EOF
-      ${var.api_result_time_aggregator}(${var.api_result_timeframe}): (
-        default(avg:azure.keyvault_vaults.service_api_result${format(module.filter-tags-statuscode.query_alert, "200")} by {name,resource_group,region}.as_rate(), 1) /
-        default(avg:azure.keyvault_vaults.service_api_result${module.filter-tags.query_alert} by {name,resource_group,region}.as_rate(), 1)
-      ) * 100 < ${var.api_result_threshold_critical}
+      ${var.api_result_time_aggregator}(${var.api_result_timeframe}):
+      default( (
+        default(avg:azure.keyvault_vaults.service_api_result${format(module.filter-tags-statuscode.query_alert, "200")} by {name,resource_group,region}.as_rate(), 0) /
+        default(avg:azure.keyvault_vaults.service_api_result${module.filter-tags.query_alert} by {name,resource_group,region}.as_rate(), 0)
+      ) * 100, 100) < ${var.api_result_threshold_critical}
   EOF
 
   thresholds {