diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
index b79713ebbb4..be553509be2 100644
--- a/public/app/features/templating/templateValuesSrv.js
+++ b/public/app/features/templating/templateValuesSrv.js
@@ -105,6 +105,8 @@ function (angular, _, kbn) {
           return op.text === urlValue || op.value === urlValue;
         });
 
+        option = option || { text: urlValue, value: urlValue };
+
         self.updateAutoInterval(variable);
         return self.setVariableValue(variable, option, true);
       });