diff --git a/src/datasource-zabbix/datasource.ts b/src/datasource-zabbix/datasource.ts
index 564bda9..d0e487e 100644
--- a/src/datasource-zabbix/datasource.ts
+++ b/src/datasource-zabbix/datasource.ts
@@ -768,7 +768,7 @@ function zabbixItemIdsTemplateFormat(value) {
  */
 function replaceTemplateVars(templateSrv, target, scopedVars) {
   let replacedTarget = templateSrv.replace(target, scopedVars, zabbixTemplateFormat);
-  if (target !== replacedTarget && !utils.isRegex(replacedTarget)) {
+  if (target && target !== replacedTarget && !utils.isRegex(replacedTarget)) {
     replacedTarget = '/^' + replacedTarget + '$/';
   }
   return replacedTarget;
diff --git a/src/datasource-zabbix/partials/query.editor.html b/src/datasource-zabbix/partials/query.editor.html
index 0aabb48..55809d9 100644
--- a/src/datasource-zabbix/partials/query.editor.html
+++ b/src/datasource-zabbix/partials/query.editor.html
@@ -160,8 +160,7 @@
         ng-class="{
           'zbx-variable': ctrl.isVariable(ctrl.target.trigger.filter),
           'zbx-regex': ctrl.isRegex(ctrl.target.trigger.filter)
-        }"
-        empty-to-null>
+        }">
     </div>
 
     <div class="gf-form max-width-20" ng-show="ctrl.target.queryType == editorMode.PROBLEMS">