diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx
index e0722709db3..e3b4008c470 100644
--- a/public/app/features/query/components/QueryEditorRow.tsx
+++ b/public/app/features/query/components/QueryEditorRow.tsx
@@ -90,7 +90,7 @@ export class QueryEditorRow extends PureComponent<Props, State> {
 
   getQueryDataSourceIdentifier(): string | null | undefined {
     const { query, dsSettings } = this.props;
-    return query.datasource ?? dsSettings.uid;
+    return query.datasource ?? dsSettings.name;
   }
 
   async loadDatasource() {