diff --git a/devenv/datasources/default/default.yaml b/devenv/datasources/default/default.yaml
index dc2310f15aa..effb7608bd0 100644
--- a/devenv/datasources/default/default.yaml
+++ b/devenv/datasources/default/default.yaml
@@ -60,7 +60,8 @@ datasources:
     url: localhost:5432
     database: grafana
     user: grafana
-    password: password
+    secureJsonData:
+      password: password
     jsonData:
       sslmode: "disable"
 
@@ -71,3 +72,4 @@ datasources:
       authType: credentials
       defaultRegion: eu-west-2
 
+
diff --git a/pkg/tsdb/sql_engine.go b/pkg/tsdb/sql_engine.go
index 82a9b8f0d88..ec908aeb9de 100644
--- a/pkg/tsdb/sql_engine.go
+++ b/pkg/tsdb/sql_engine.go
@@ -68,6 +68,7 @@ func (e *DefaultSqlEngine) InitEngine(driverName string, dsInfo *models.DataSour
 	engine.SetMaxOpenConns(10)
 	engine.SetMaxIdleConns(10)
 
+	engineCache.versions[dsInfo.Id] = dsInfo.Version
 	engineCache.cache[dsInfo.Id] = engine
 	e.XormEngine = engine