diff --git a/public/app/features/templating/editor_ctrl.ts b/public/app/features/templating/editor_ctrl.ts
index 7bd745bed53..002afa4264b 100644
--- a/public/app/features/templating/editor_ctrl.ts
+++ b/public/app/features/templating/editor_ctrl.ts
@@ -77,6 +77,11 @@ export class VariableEditorCtrl {
         return false;
       }
 
+      if ($scope.current.type === 'query' && $scope.current.query.match(new RegExp('\\$' + $scope.current.name))) {
+        $scope.appEvent('alert-warning', ['Validation', 'Query contains variable self-reference']);
+        return false;
+      }
+
       return true;
     };