diff --git a/middleware/nginx/inputs.tf b/middleware/nginx/inputs.tf
index 30345ad..786bdb8 100644
--- a/middleware/nginx/inputs.tf
+++ b/middleware/nginx/inputs.tf
@@ -55,10 +55,16 @@ variable "nginx_connect_message" {
   default     = ""
 }
 
-variable "nginx_connect_threshold_critical" {
-  description = "Nginx status monitor (critical threshold)"
+variable "nginx_connect_threshold_warning" {
+  description = "Nginx status monitor (warning threshold)"
   type        = "string"
-  default     = "1.1754943508222875e-38"
+  default     = 3
+}
+
+variable "nginx_connect_no_data_timeframe" {
+  description = "Nginx status monitor no data timeframe"
+  type        = "string"
+  default     = 10
 }
 
 variable "nginx_dropped_silenced" {
diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf
index ade45f1..3ab9211 100644
--- a/middleware/nginx/monitors-nginx.tf
+++ b/middleware/nginx/monitors-nginx.tf
@@ -6,15 +6,16 @@ resource "datadog_monitor" "datadog_nginx_process" {
   type = "service check"
 
   query = <<EOF
-    "nginx.can_connect".over${module.filter-tags.service_check}.by("host","port","server").last(1).pct_by_status()
+    "nginx.can_connect".over${module.filter-tags.service_check}.by("server","port").last(6).count_by_status()
   EOF
 
   thresholds = {
-    warning  = 0
-    critical = "${var.nginx_connect_threshold_critical}"
+    warning  = "${var.nginx_connect_threshold_warning}"
+    critical = 5
   }
 
   notify_no_data      = true
+  no_data_timeframe   = "${var.nginx_connect_no_data_timeframe}"
   new_host_delay      = "${var.new_host_delay}"
   renotify_interval   = 0
   notify_audit        = false