diff --git a/conf/defaults.ini b/conf/defaults.ini
index 685699b19db..53a034bfeaa 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -387,9 +387,6 @@ global_session = -1
 [alerting]
 enabled = true
 
-# Skip ssl validation for queries sent to the timeserie database.
-skip_ssl_validation = false
-
 #################################### Internal Grafana Metrics ##########################
 # Metrics available at HTTP API Url /api/metrics
 [metrics]
diff --git a/conf/sample.ini b/conf/sample.ini
index d72e63db508..2c428ea775f 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -333,9 +333,6 @@ check_for_updates = true
 [alerting]
 ;enabled = false
 
-# Skip ssl validation for queries sent to the timeserie database.
-;skip_ssl_validation = false
-
 #################################### Internal Grafana Metrics ##########################
 # Metrics available at HTTP API Url /api/metrics
 [metrics]
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 376e1c1408a..aa0ce883423 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -141,8 +141,7 @@ var (
 	Quota QuotaSettings
 
 	// Alerting
-	AlertingEnabled           bool
-	AlertingSkipSSLValidation bool
+	AlertingEnabled bool
 
 	// logger
 	logger log.Logger
diff --git a/pkg/tsdb/graphite/graphite.go b/pkg/tsdb/graphite/graphite.go
index ec1e454e6e9..4042702378c 100644
--- a/pkg/tsdb/graphite/graphite.go
+++ b/pkg/tsdb/graphite/graphite.go
@@ -34,7 +34,7 @@ func init() {
 	tsdb.RegisterExecutor("graphite", NewGraphiteExecutor)
 
 	tr := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: setting.AlertingSkipSSLValidation},
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 	}
 
 	HttpClient = http.Client{