diff --git a/public/app/features/variables/query/QueryVariableEditor.tsx b/public/app/features/variables/query/QueryVariableEditor.tsx
index 49b239fac1c..50bd589a9e5 100644
--- a/public/app/features/variables/query/QueryVariableEditor.tsx
+++ b/public/app/features/variables/query/QueryVariableEditor.tsx
@@ -152,6 +152,7 @@ export class QueryVariableEditorUnConnected extends PureComponent<Props, State>
       return (
         <Field label="Query">
           <VariableQueryEditor
+            key={datasource.uid}
             datasource={datasource}
             query={query}
             templateSrv={getTemplateSrv()}
@@ -167,6 +168,7 @@ export class QueryVariableEditorUnConnected extends PureComponent<Props, State>
       return (
         <Field label="Query">
           <VariableQueryEditor
+            key={datasource.uid}
             datasource={datasource}
             query={query}
             onChange={this.onQueryChange}