diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index f8c73936f37..714c544a0bb 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -305,8 +305,12 @@ export class QueryGroup extends PureComponent<Props, State> {
   }
 
   renderExtraActions() {
-    return GroupActionComponents.getAllExtraRenderAction().map((c) => {
-      return React.createElement(c, { onAddQuery: this.onAddQuery, onChangeDataSource: this.onChangeDataSource });
+    return GroupActionComponents.getAllExtraRenderAction().map((c, index) => {
+      return React.createElement(c, {
+        onAddQuery: this.onAddQuery,
+        onChangeDataSource: this.onChangeDataSource,
+        key: index,
+      });
     });
   }