diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor.tsx
index 1cb547cd7a0..9dfea5b726d 100644
--- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor.tsx
@@ -159,6 +159,7 @@ export class QueryEditor extends PureComponent<Props, State> {
                   const { [newKey]: value, ...newDimensions } = query.dimensions;
                   return datasource
                     .getDimensionValues(query.region, query.namespace, query.metricName, newKey, newDimensions)
+                    .then(values => (values.length ? [{ value: '*', text: '*', label: '*' }, ...values] : values))
                     .then(this.appendTemplateVariables);
                 }}
               />
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts
index 07d32a52c1f..ce9b11af910 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.ts
@@ -375,7 +375,7 @@ export default class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery,
       dimensions: this.convertDimensionFormat(filterDimensions, {}),
     });
 
-    return values.length ? [{ value: '*', text: '*', label: '*' }, ...values] : values;
+    return values;
   }
 
   getEbsVolumeIds(region: string, instanceId: string) {
diff --git a/public/app/plugins/datasource/cloudwatch/module.tsx b/public/app/plugins/datasource/cloudwatch/module.tsx
index 8880acaaa64..ae3e0480ddb 100644
--- a/public/app/plugins/datasource/cloudwatch/module.tsx
+++ b/public/app/plugins/datasource/cloudwatch/module.tsx
@@ -1,3 +1,4 @@
+import './query_parameter_ctrl';
 import { DataSourcePlugin } from '@grafana/data';
 import { ConfigEditor } from './components/ConfigEditor';
 import { QueryEditor } from './components/QueryEditor';