diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 4442f004b82..3440ddb3715 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -98,7 +98,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 	}
 
 	if defaultDatasource == "" {
-		defaultDatasource = "grafana"
+		defaultDatasource = "-- Grafana --"
 	}
 
 	jsonObj := map[string]interface{}{
diff --git a/public/app/panels/singlestat/module.js b/public/app/panels/singlestat/module.js
index e4aeb19071b..f1ea8561b94 100644
--- a/public/app/panels/singlestat/module.js
+++ b/public/app/panels/singlestat/module.js
@@ -37,6 +37,7 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
     // Set and populate defaults
     var _d = {
       links: [],
+      datasource: null,
       maxDataPoints: 100,
       interval: null,
       targets: [{}],