diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index e1c68e973a8..828a8bf71dc 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -306,6 +306,9 @@ function (angular, _, kbn) {
         .map(function(metric) {
           return metric.Dimensions;
         })
+        .reject(function(metric) {
+          return _.isEmpty(metric);
+        })
         .value();
 
         return d.resolve(suggestData);