diff --git a/public/app/plugins/datasource/azuremonitor/datasource.ts b/public/app/plugins/datasource/azuremonitor/datasource.ts
index 9e785df76d8..224f4680f7b 100644
--- a/public/app/plugins/datasource/azuremonitor/datasource.ts
+++ b/public/app/plugins/datasource/azuremonitor/datasource.ts
@@ -76,8 +76,10 @@ export default class Datasource extends DataSourceWithBackend<AzureMonitorQuery,
     if (!item.queryType) {
       return false;
     }
+
+    const query = migrateQuery(item);
     const ds = this.pseudoDatasource[item.queryType];
-    return ds?.filterQuery?.(item) ?? true;
+    return ds?.filterQuery?.(query) ?? true;
   }
 
   query(options: DataQueryRequest<AzureMonitorQuery>): Observable<DataQueryResponse> {
diff --git a/public/app/plugins/datasource/cloud-monitoring/datasource.ts b/public/app/plugins/datasource/cloud-monitoring/datasource.ts
index cdde6ea4763..41ed0511c6e 100644
--- a/public/app/plugins/datasource/cloud-monitoring/datasource.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/datasource.ts
@@ -303,11 +303,13 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
     }, {} as T);
   }
 
-  filterQuery(query: CloudMonitoringQuery): boolean {
-    if (query.hide) {
+  filterQuery(item: CloudMonitoringQuery): boolean {
+    if (item.hide) {
       return false;
     }
 
+    const query = this.migrateQuery(item);
+
     if (query.queryType === QueryType.SLO) {
       if (!query.sloQuery) {
         return false;