diff --git a/public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts b/public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
index d30fb7626cc..02dc3ec6d67 100644
--- a/public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
+++ b/public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
@@ -41,8 +41,13 @@ export class StackdriverAggregationCtrl {
   }
 
   onAggregationChange(newVal: string) {
-    if (newVal !== 'REDUCE_NONE') {
-      const newAlignmentOption = options.alignOptions.find(o => o.value !== 'ALIGN_NONE');
+    if (newVal !== 'REDUCE_NONE' && this.target.aggregation.perSeriesAligner === 'ALIGN_NONE') {
+      const newAlignmentOption = options.alignOptions.find(
+        o =>
+          o.value !== 'ALIGN_NONE' &&
+          o.valueTypes.indexOf(this.target.valueType) !== -1 &&
+          o.metricKinds.indexOf(this.target.metricKind) !== -1
+      );
       this.target.aggregation.perSeriesAligner = newAlignmentOption ? newAlignmentOption.value : '';
     }
     this.refresh();