diff --git a/src/go/collectors/go.d.plugin/modules/whoisquery/whoisquery.go b/src/go/collectors/go.d.plugin/modules/whoisquery/whoisquery.go
index 1e8d4dd4d5..1982f910df 100644
--- a/src/go/collectors/go.d.plugin/modules/whoisquery/whoisquery.go
+++ b/src/go/collectors/go.d.plugin/modules/whoisquery/whoisquery.go
@@ -29,8 +29,8 @@ func New() *WhoisQuery {
 	return &WhoisQuery{
 		Config: Config{
 			Timeout:       web.Duration(time.Second * 5),
-			DaysUntilWarn: 90,
-			DaysUntilCrit: 30,
+			DaysUntilWarn: 30,
+			DaysUntilCrit: 15,
 		},
 	}
 }
diff --git a/src/go/collectors/go.d.plugin/modules/whoisquery/whoisquery_test.go b/src/go/collectors/go.d.plugin/modules/whoisquery/whoisquery_test.go
index 3d163d597d..59ec659b15 100644
--- a/src/go/collectors/go.d.plugin/modules/whoisquery/whoisquery_test.go
+++ b/src/go/collectors/go.d.plugin/modules/whoisquery/whoisquery_test.go
@@ -105,8 +105,8 @@ func TestWhoisQuery_Collect(t *testing.T) {
 
 	expected := map[string]int64{
 		"expiry":                         12345,
-		"days_until_expiration_warning":  90,
-		"days_until_expiration_critical": 30,
+		"days_until_expiration_warning":  30,
+		"days_until_expiration_critical": 15,
 	}
 
 	assert.NotZero(t, collected)