diff --git a/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx b/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
index f33154f65d9..8c8c89f9197 100644
--- a/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/TemplateQueryComponent.tsx
@@ -57,7 +57,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
       metricTypes,
       selectedMetricType,
       metricDescriptors,
-      ...await this.getLabels(this.state.selectedMetricType),
+      ...await this.getLabels(selectedMetricType),
     };
     this.setState(state);
   }
@@ -95,7 +95,7 @@ export class StackdriverTemplateQueryComponent extends PureComponent<TemplateQue
   }
 
   componentDidUpdate() {
-    const { metricDescriptors, labels, ...queryModel } = this.state;
+    const { metricDescriptors, labels, metricTypes, services, ...queryModel } = this.state;
     this.props.onChange(queryModel);
   }
 
diff --git a/public/app/plugins/datasource/stackdriver/functions.ts b/public/app/plugins/datasource/stackdriver/functions.ts
index bc11fe5aaf2..30b4a7b84f6 100644
--- a/public/app/plugins/datasource/stackdriver/functions.ts
+++ b/public/app/plugins/datasource/stackdriver/functions.ts
@@ -12,7 +12,7 @@ export const getMetricTypes = (metricDescriptors, metricType, selectedService) =
     name: m.displayName,
   }));
   const metricTypeExistInArray = metricTypes.some(m => m.value === metricType);
-  const selectedMetricType = metricTypeExistInArray ? metricTypeExistInArray.value : metricTypes[0].value;
+  const selectedMetricType = metricTypeExistInArray ? metricType : metricTypes[0].value;
   return {
     metricTypes,
     selectedMetricType,