diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.test.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.test.tsx
index a25a4868ca6..4ec906daf74 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.test.tsx
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.test.tsx
@@ -245,6 +245,25 @@ describe('VariableEditor:', () => {
       );
     });
 
+    it('should clean up related fields', async () => {
+      const onChange = jest.fn();
+      const { rerender } = render(<VariableEditor {...defaultProps} onChange={onChange} />);
+      // wait for initial load
+      await waitFor(() => expect(screen.getByText('Logs')).toBeInTheDocument());
+      // Select a new query type
+      await selectAndRerender('select query type', 'Subscriptions', onChange, rerender);
+      expect(onChange).toHaveBeenCalledWith(
+        expect.objectContaining({
+          queryType: AzureQueryType.SubscriptionsQuery,
+          subscription: undefined,
+          resourceGroup: undefined,
+          namespace: undefined,
+          resource: undefined,
+          refId: 'A',
+        })
+      );
+    });
+
     it('should run the query if requesting workspaces', async () => {
       const onChange = jest.fn();
       const { rerender } = render(<VariableEditor {...defaultProps} onChange={onChange} />);
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.tsx
index 049377dd479..de08439e49f 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.tsx
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.tsx
@@ -149,6 +149,10 @@ const VariableEditor = (props: Props) => {
       onChange({
         ...query,
         queryType: selectableValue.value,
+        subscription: undefined,
+        resourceGroup: undefined,
+        namespace: undefined,
+        resource: undefined,
       });
     }
   };
@@ -158,6 +162,9 @@ const VariableEditor = (props: Props) => {
       onChange({
         ...query,
         subscription: selectableValue.value,
+        resourceGroup: undefined,
+        namespace: undefined,
+        resource: undefined,
       });
     }
   };
@@ -166,6 +173,8 @@ const VariableEditor = (props: Props) => {
     onChange({
       ...query,
       resourceGroup: selectableValue.value,
+      namespace: undefined,
+      resource: undefined,
     });
   };
 
@@ -173,6 +182,7 @@ const VariableEditor = (props: Props) => {
     onChange({
       ...query,
       namespace: selectableValue.value,
+      resource: undefined,
     });
   };
 
@@ -229,7 +239,7 @@ const VariableEditor = (props: Props) => {
             onChange={onChangeSubscription}
             options={subscriptions.concat(variableOptionGroup)}
             width={25}
-            value={query.subscription}
+            value={query.subscription || null}
           />
         </InlineField>
       )}
@@ -244,8 +254,8 @@ const VariableEditor = (props: Props) => {
                 : resourceGroups.concat(variableOptionGroup, removeOption)
             }
             width={25}
-            value={query.resourceGroup}
-            placeholder={requireResourceGroup ? '' : 'Optional'}
+            value={query.resourceGroup || null}
+            placeholder={requireResourceGroup ? undefined : 'Optional'}
           />
         </InlineField>
       )}
@@ -260,8 +270,8 @@ const VariableEditor = (props: Props) => {
                 : namespaces.concat(variableOptionGroup, removeOption)
             }
             width={25}
-            value={query.namespace}
-            placeholder={requireNamespace ? '' : 'Optional'}
+            value={query.namespace || null}
+            placeholder={requireNamespace ? undefined : 'Optional'}
           />
         </InlineField>
       )}
@@ -272,7 +282,7 @@ const VariableEditor = (props: Props) => {
             onChange={onChangeResource}
             options={resources.concat(variableOptionGroup)}
             width={25}
-            value={query.resource}
+            value={query.resource || null}
           />
         </InlineField>
       )}