diff --git a/public/app/plugins/datasource/mssql/config_ctrl.ts b/public/app/plugins/datasource/mssql/config_ctrl.ts
new file mode 100644
index 00000000000..c80d657a914
--- /dev/null
+++ b/public/app/plugins/datasource/mssql/config_ctrl.ts
@@ -0,0 +1,10 @@
+export class MssqlConfigCtrl {
+  static templateUrl = 'partials/config.html';
+
+  current: any;
+
+  /** @ngInject */
+  constructor($scope) {
+    this.current.jsonData.encrypt = this.current.jsonData.encrypt || 'false';
+  }
+}
diff --git a/public/app/plugins/datasource/mssql/module.ts b/public/app/plugins/datasource/mssql/module.ts
index 478ecadcb3e..bf46b6d0947 100644
--- a/public/app/plugins/datasource/mssql/module.ts
+++ b/public/app/plugins/datasource/mssql/module.ts
@@ -1,9 +1,6 @@
 import { MssqlDatasource } from './datasource';
 import { MssqlQueryCtrl } from './query_ctrl';
-
-class MssqlConfigCtrl {
-  static templateUrl = 'partials/config.html';
-}
+import { MssqlConfigCtrl } from './config_ctrl';
 
 const defaultQuery = `SELECT
     <time_column> as time,
diff --git a/public/app/plugins/datasource/mssql/partials/config.html b/public/app/plugins/datasource/mssql/partials/config.html
index 876e1eb89cb..db76f60e5e3 100644
--- a/public/app/plugins/datasource/mssql/partials/config.html
+++ b/public/app/plugins/datasource/mssql/partials/config.html
@@ -31,7 +31,7 @@
 	<div class="gf-form">
 		<label class="gf-form-label width-7">Encrypt</label>
 		<div class="gf-form-select-wrapper max-width-15 gf-form-select-wrapper--has-help-icon">
-			<select class="gf-form-input" ng-model="ctrl.current.jsondata.encrypt" ng-options="mode for mode in ['disable', 'false', 'true']" ng-init="ctrl.current.jsondata.encrypt"></select>
+			<select class="gf-form-input" ng-model="ctrl.current.jsonData.encrypt" ng-options="mode for mode in ['disable', 'false', 'true']" ng-init="ctrl.current.jsonData.encrypt"></select>
 			<info-popover mode="right-absolute">
 				Determines whether or to which extent a secure SSL TCP/IP connection will be negotiated with the server.
 				<ul>