diff --git a/public/app/core/components/sql_part/sql_part_editor.ts b/public/app/core/components/sql_part/sql_part_editor.ts
index 56329d58a6c..c30cf76b685 100644
--- a/public/app/core/components/sql_part/sql_part_editor.ts
+++ b/public/app/core/components/sql_part/sql_part_editor.ts
@@ -105,6 +105,12 @@ export function sqlPartEditorDirective($compile, templateSrv) {
               var dynamicOptions = _.map(result, function(op) {
                 return op.value;
               });
+
+              // add current value to dropdown if its not in dynamicOptions
+              if (_.indexOf(dynamicOptions, part.params[paramIndex]) === -1) {
+                dynamicOptions.unshift(part.params[paramIndex]);
+              }
+
               callback(dynamicOptions);
             });
           });