diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index fc5d9f02997..8847055bbd7 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -22,7 +22,6 @@ import {
   DataQuery,
   DataSourceApi,
   DataSourceInstanceSettings,
-  DataSourceRef,
   getDefaultTimeRange,
   LoadingState,
   PanelData,
@@ -89,10 +88,10 @@ export class QueryGroup extends PureComponent<Props, State> {
     });
 
     try {
-      const ds = await this.dataSourceSrv.get(options.dataSource.name);
-      const dsSettings = this.dataSourceSrv.getInstanceSettings(options.dataSource.name);
+      const ds = await this.dataSourceSrv.get(options.dataSource);
+      const dsSettings = this.dataSourceSrv.getInstanceSettings(options.dataSource);
       const defaultDataSource = await this.dataSourceSrv.get();
-      const datasource: DataSourceRef = { type: ds.type, uid: ds.uid };
+      const datasource = ds.getRef();
       const queries = options.queries.map((q) => (q.datasource ? q : { ...q, datasource }));
       this.setState({ queries, dataSource: ds, dsSettings, defaultDataSource });
     } catch (error) {