diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryFieldsEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryFieldsEditor.tsx
index 5aa9cef3bb0..ba8c34519c9 100644
--- a/public/app/plugins/datasource/cloudwatch/components/QueryFieldsEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/QueryFieldsEditor.tsx
@@ -94,7 +94,7 @@ export function QueryFieldsEditor({
           placeholder="Select region"
           options={regions}
           allowCustomValue
-          onChange={({ value: region }) => onChange({ ...query, region })}
+          onChange={({ value: region }) => onQueryChange({ ...query, region })}
         />
       </QueryInlineField>
 
@@ -106,7 +106,7 @@ export function QueryFieldsEditor({
               placeholder="Select namespace"
               allowCustomValue
               options={namespaces}
-              onChange={({ value: namespace }) => onChange({ ...query, namespace })}
+              onChange={({ value: namespace }) => onQueryChange({ ...query, namespace })}
             />
           </QueryInlineField>
 
@@ -116,7 +116,7 @@ export function QueryFieldsEditor({
               placeholder="Select metric name"
               allowCustomValue
               loadOptions={loadMetricNames}
-              onChange={({ value: metricName }) => onChange({ ...query, metricName })}
+              onChange={({ value: metricName }) => onQueryChange({ ...query, metricName })}
             />
           </QueryInlineField>