diff --git a/pkg/api/dataproxy.go b/pkg/api/dataproxy.go
index 775276a05ad..871212adc6f 100644
--- a/pkg/api/dataproxy.go
+++ b/pkg/api/dataproxy.go
@@ -17,8 +17,6 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 )
 
-var i int = 0
-
 var dataProxyTransport = &http.Transport{
 	TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 	Proxy:           http.ProxyFromEnvironment,
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
index d830d10cd6a..9982827d858 100644
--- a/pkg/metrics/metrics.go
+++ b/pkg/metrics/metrics.go
@@ -1,7 +1,12 @@
 package metrics
 
-var MetricStats = NewRegistry()
-var UseNilMetrics bool = true
+var MetricStats Registry
+var UseNilMetrics bool
+
+func init() {
+	// init with nil metrics
+	initMetricVars(&MetricSettings{})
+}
 
 var (
 	M_Instance_Start                  Counter
@@ -31,6 +36,7 @@ var (
 
 func initMetricVars(settings *MetricSettings) {
 	UseNilMetrics = settings.Enabled == false
+	MetricStats = NewRegistry()
 
 	M_Instance_Start = RegCounter("instance_start")