diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index da95578782e..435d9ef8b4c 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -129,7 +129,7 @@ function (angular, _) {
         .pluck('Dimensions')
         .flatten()
         .filter(function(dimension) {
-          return dimension.Name === dimensionKey;
+          return dimension !== null && dimension.Name === dimensionKey;
         })
         .pluck('Value')
         .uniq()