diff --git a/src/datasource-zabbix/config.controller.js b/src/datasource-zabbix/config.controller.js
index 0c875947e..342c4f046 100644
--- a/src/datasource-zabbix/config.controller.js
+++ b/src/datasource-zabbix/config.controller.js
@@ -28,9 +28,16 @@ export class ZabbixDSConfigController {
 
     this.current.jsonData = migrateDSConfig(this.current.jsonData);
     _.defaults(this.current.jsonData, defaultConfig);
+
+    this.dbConnectionEnable = this.current.jsonData.dbConnectionEnable;
+    this.dbConnectionDatasourceId = this.current.jsonData.dbConnectionDatasourceId;
+
     this.dbDataSources = this.getSupportedDBDataSources();
     this.zabbixVersions = _.cloneDeep(zabbixVersions);
     this.autoDetectZabbixVersion();
+    if (!this.dbConnectionDatasourceId) {
+      this.loadCurrentDBDatasource();
+    }
   }
 
   getSupportedDBDataSources() {
@@ -41,11 +48,21 @@ export class ZabbixDSConfigController {
   }
 
   getCurrentDatasourceType() {
-    const dsId = this.current.jsonData.dbConnectionDatasourceId;
+    const dsId = this.dbConnectionDatasourceId;
     const currentDs = _.find(this.dbDataSources, { 'id': dsId });
     return currentDs ? currentDs.type : null;
   }
 
+  loadCurrentDBDatasource() {
+    const dsName= this.current.jsonData.dbConnectionDatasourceName;
+    this.datasourceSrv.loadDatasource(dsName)
+    .then(ds => {
+      if (ds) {
+        this.dbConnectionDatasourceId = ds.id;
+      }
+    });
+  }
+
   autoDetectZabbixVersion() {
     if (!this.current.id) {
       return;
diff --git a/src/datasource-zabbix/partials/config.html b/src/datasource-zabbix/partials/config.html
index 1e9f6821f..8fd1ac134 100644
--- a/src/datasource-zabbix/partials/config.html
+++ b/src/datasource-zabbix/partials/config.html
@@ -88,9 +88,9 @@ <h3 class="page-heading">Zabbix API details</h3>
   <h3 class="page-heading">Direct DB Connection</h3>
   <gf-form-switch class="gf-form" label-class="width-12"
     label="Enable"
-    checked="ctrl.current.jsonData.dbConnectionEnable">
+    checked="ctrl.dbConnectionEnable">
   </gf-form-switch>
-  <div ng-if="ctrl.current.jsonData.dbConnectionEnable">
+  <div ng-if="ctrl.dbConnectionEnable">
     <div class="gf-form max-width-30">
       <span class="gf-form-label width-12">
         Data Source
@@ -103,7 +103,7 @@ <h3 class="page-heading">Direct DB Connection</h3>
         </info-popover>
       </span>
       <div class="gf-form-select-wrapper max-width-16">
-        <select class="gf-form-input" ng-model="ctrl.current.jsonData.dbConnectionDatasourceId"
+        <select class="gf-form-input" ng-model="ctrl.dbConnectionDatasourceId"
           ng-options="ds.id as ds.name for ds in ctrl.dbDataSources">
         </select>
       </div>
diff --git a/src/datasource-zabbix/specs/utils.spec.js b/src/datasource-zabbix/specs/utils.spec.js
index 3367f1f9e..01cc76fe4 100644
--- a/src/datasource-zabbix/specs/utils.spec.js
+++ b/src/datasource-zabbix/specs/utils.spec.js
@@ -155,7 +155,7 @@ describe('Utils', () => {
           depth: 2
         },
         {
-          array: [ [[1, 2], [3, 4]], [[1, 2], [3, 4]] ],
+          array: [[[1, 2], [3, 4]], [[1, 2], [3, 4]]],
           depth: 3
         },
       ];
diff --git a/src/datasource-zabbix/zabbix/connectors/dbConnector.js b/src/datasource-zabbix/zabbix/connectors/dbConnector.js
index 8f3ee5ac3..c4039a165 100644
--- a/src/datasource-zabbix/zabbix/connectors/dbConnector.js
+++ b/src/datasource-zabbix/zabbix/connectors/dbConnector.js
@@ -65,6 +65,9 @@ export class DBConnector {
       if (!this.datasourceName) {
         this.datasourceName = ds.name;
       }
+      if (!this.datasourceId) {
+        this.datasourceId = ds.id;
+      }
       return ds;
     });
   }