diff --git a/pkg/services/ngalert/models/alert_query.go b/pkg/services/ngalert/models/alert_query.go
index 516a967bfc1..c500ca6e3fc 100644
--- a/pkg/services/ngalert/models/alert_query.go
+++ b/pkg/services/ngalert/models/alert_query.go
@@ -9,7 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/expr"
 )
 
-const defaultMaxDataPoints float64 = 100
+const defaultMaxDataPoints float64 = 43200 // 12 hours at 1sec interval
 const defaultIntervalMS float64 = 1000
 
 // Duration is a type used for marshalling durations.
diff --git a/pkg/services/ngalert/ngalert.go b/pkg/services/ngalert/ngalert.go
index 5e5afb69c8d..96e1e2b6143 100644
--- a/pkg/services/ngalert/ngalert.go
+++ b/pkg/services/ngalert/ngalert.go
@@ -109,7 +109,7 @@ func (ng *AlertNG) Init() error {
 	return nil
 }
 
-// Run starts the scheduler
+// Run starts the scheduler.
 func (ng *AlertNG) Run(ctx context.Context) error {
 	ng.Log.Debug("ngalert starting")
 	ng.schedule.WarmStateCache(ng.stateManager)
diff --git a/pkg/tests/api/alerting/api_alertmanager_test.go b/pkg/tests/api/alerting/api_alertmanager_test.go
index ec9a71153d4..be53c21e631 100644
--- a/pkg/tests/api/alerting/api_alertmanager_test.go
+++ b/pkg/tests/api/alerting/api_alertmanager_test.go
@@ -863,7 +863,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 								"model":{
 								   "expression":"2 + 3 \u003e 1",
 								   "intervalMs":1000,
-								   "maxDataPoints":100,
+								   "maxDataPoints":43200,
 								   "type":"math"
 								}
 							 }
@@ -898,7 +898,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 								"model":{
 								   "expression":"2 + 3 \u003e 1",
 								   "intervalMs":1000,
-								   "maxDataPoints":100,
+								   "maxDataPoints":43200,
 								   "type":"math"
 								}
 							 }
@@ -1122,7 +1122,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 								"model":{
 		                           "expression":"2 + 3 \u003C 1",
 		                           "intervalMs":1000,
-		                           "maxDataPoints":100,
+		                           "maxDataPoints":43200,
 		                           "type":"math"
 		                        }
 		                     }
diff --git a/pkg/tests/api/alerting/api_prometheus_test.go b/pkg/tests/api/alerting/api_prometheus_test.go
index 81b49aad636..59bf4c5ef12 100644
--- a/pkg/tests/api/alerting/api_prometheus_test.go
+++ b/pkg/tests/api/alerting/api_prometheus_test.go
@@ -168,7 +168,7 @@ func TestPrometheusRules(t *testing.T) {
 			"rules": [{
 				"state": "inactive",
 				"name": "AlwaysFiring",
-				"query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":100,\"type\":\"math\"}}]",
+				"query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":43200,\"type\":\"math\"}}]",
 				"duration": 10,
 				"annotations": {
 					"annotation1": "val1"
@@ -184,7 +184,7 @@ func TestPrometheusRules(t *testing.T) {
 			}, {
 				"state": "inactive",
 				"name": "AlwaysFiringButSilenced",
-				"query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":100,\"type\":\"math\"}}]",
+				"query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":43200,\"type\":\"math\"}}]",
 				"labels": null,
 				"health": "ok",
 				"lastError": "",
@@ -223,7 +223,7 @@ func TestPrometheusRules(t *testing.T) {
 			"rules": [{
 				"state": "inactive",
 				"name": "AlwaysFiring",
-				"query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":100,\"type\":\"math\"}}]",
+				"query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":43200,\"type\":\"math\"}}]",
 				"duration": 10,
 				"annotations": {
 					"annotation1": "val1"
@@ -239,7 +239,7 @@ func TestPrometheusRules(t *testing.T) {
 			}, {
 				"state": "inactive",
 				"name": "AlwaysFiringButSilenced",
-				"query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":100,\"type\":\"math\"}}]",
+				"query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":43200,\"type\":\"math\"}}]",
 				"labels": null,
 				"health": "ok",
 				"lastError": "",
diff --git a/pkg/tests/api/alerting/api_ruler_test.go b/pkg/tests/api/alerting/api_ruler_test.go
index cdac017299f..531fe7585d8 100644
--- a/pkg/tests/api/alerting/api_ruler_test.go
+++ b/pkg/tests/api/alerting/api_ruler_test.go
@@ -94,7 +94,7 @@ func TestAlertRulePermissions(t *testing.T) {
 								"model":{
 		                           "expression":"2 + 3 \u003E 1",
 		                           "intervalMs":1000,
-		                           "maxDataPoints":100,
+		                           "maxDataPoints":43200,
 		                           "type":"math"
 		                        }
 		                     }
@@ -144,7 +144,7 @@ func TestAlertRulePermissions(t *testing.T) {
 								"model":{
 		                           "expression":"2 + 3 \u003E 1",
 		                           "intervalMs":1000,
-		                           "maxDataPoints":100,
+		                           "maxDataPoints":43200,
 		                           "type":"math"
 		                        }
 		                     }
@@ -216,7 +216,7 @@ func TestAlertRulePermissions(t *testing.T) {
 								"model":{
 		                           "expression":"2 + 3 \u003E 1",
 		                           "intervalMs":1000,
-		                           "maxDataPoints":100,
+		                           "maxDataPoints":43200,
 		                           "type":"math"
 		                        }
 		                     }