diff --git a/public/app/features/query/components/QueryActionComponent.ts b/public/app/features/query/components/QueryActionComponent.ts
index cbee1ec711d..a4109ea7194 100644
--- a/public/app/features/query/components/QueryActionComponent.ts
+++ b/public/app/features/query/components/QueryActionComponent.ts
@@ -1,10 +1,11 @@
-import { DataQuery, TimeRange } from '@grafana/data';
+import { DataQuery, DataSourceInstanceSettings, TimeRange } from '@grafana/data';
 
 interface ActionComponentProps {
   query?: DataQuery;
   queries?: Array<Partial<DataQuery>>;
   onAddQuery?: (q: DataQuery) => void;
   timeRange?: TimeRange;
+  dataSource?: DataSourceInstanceSettings;
 }
 
 type QueryActionComponent = React.ComponentType<ActionComponentProps>;
diff --git a/public/app/features/query/components/QueryEditorRow.tsx b/public/app/features/query/components/QueryEditorRow.tsx
index 047e977deaf..2e8e137999e 100644
--- a/public/app/features/query/components/QueryEditorRow.tsx
+++ b/public/app/features/query/components/QueryEditorRow.tsx
@@ -303,13 +303,14 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
   }
 
   renderExtraActions = () => {
-    const { query, queries, data, onAddQuery } = this.props;
+    const { query, queries, data, onAddQuery, dataSource } = this.props;
     return RowActionComponents.getAllExtraRenderAction().map((c) => {
       return React.createElement(c, {
         query,
         queries,
         timeRange: data.timeRange,
         onAddQuery: onAddQuery as (query: DataQuery) => void,
+        dataSource: dataSource,
       });
     });
   };