diff --git a/public/app/features/panel/query_editor.ts b/public/app/features/panel/query_editor.ts
index 5c33480a3ab..89038f0f430 100644
--- a/public/app/features/panel/query_editor.ts
+++ b/public/app/features/panel/query_editor.ts
@@ -30,6 +30,10 @@ function pluginDirectiveLoader($compile, datasourceSrv) {
       case "metrics-query-editor": {
         let datasource = scope.target.datasource || scope.ctrl.panel.datasource;
         return datasourceSrv.get(datasource).then(ds => {
+          if (!scope.target.refId) {
+            scope.target.refId = 'A';
+          }
+
           return System.import(ds.meta.module).then(dsModule => {
             return {
               name: 'metrics-query-editor-' + ds.meta.id,
diff --git a/public/app/plugins/datasource/grafana/module.ts b/public/app/plugins/datasource/grafana/module.ts
index b725a162426..860cae89483 100644
--- a/public/app/plugins/datasource/grafana/module.ts
+++ b/public/app/plugins/datasource/grafana/module.ts
@@ -3,24 +3,8 @@
 import angular from 'angular';
 import {GrafanaDatasource} from './datasource';
 
-var module = angular.module('grafana.directives');
-
-function grafanaMetricsQueryEditor() {
-  return {templateUrl: 'app/plugins/datasource/grafana/partials/query.editor.html'};
-}
-
-export class MetricsQueryEditor {
-  panelCtrl: any;
-  target: any;
-}
-
-class GrafanaMetricsQueryEditor extends MetricsQueryEditor {
+class GrafanaMetricsQueryEditor {
   static templateUrl = 'app/plugins/datasource/grafana/partials/query.editor.html';
-
-  constructor() {
-    super();
-    console.log('this is a metrics editor', this.panelCtrl, this.target);
-  }
 }
 
 export {
diff --git a/public/app/plugins/datasource/grafana/partials/query.editor.html b/public/app/plugins/datasource/grafana/partials/query.editor.html
index 15297d5c3f0..fd2953e4be4 100644
--- a/public/app/plugins/datasource/grafana/partials/query.editor.html
+++ b/public/app/plugins/datasource/grafana/partials/query.editor.html
@@ -41,7 +41,7 @@
 
 	<ul class="tight-form-list">
 		<li class="tight-form-item" style="min-width: 15px; text-align: center">
-			{{target.refId}}
+			{{ctrl.target.refId}}
 		</li>
 		<li>
 			<a class="tight-form-item" ng-click="target.hide = !target.hide; get_data();" role="menuitem">