diff --git a/blocks/query/edit.tsx b/blocks/query/edit.tsx
index 76cc7974..8334725c 100644
--- a/blocks/query/edit.tsx
+++ b/blocks/query/edit.tsx
@@ -13,7 +13,12 @@ import {
   TextControl,
 } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
-import { createInterpolateElement, useEffect, useState } from '@wordpress/element';
+import {
+  Fragment,
+  createInterpolateElement,
+  useEffect,
+  useState,
+} from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { addQueryArgs } from '@wordpress/url';
 
@@ -303,10 +308,13 @@ export default function Edit({
           className="manual-posts"
         >
           {manualPosts.map((_post, index) => (
-            <PanelRow className={classnames(
-              'manual-posts__container',
-              { 'manual-posts__container--selected': manualPosts[index] },
-            )}
+            <PanelRow
+              // eslint-disable-next-line react/no-array-index-key
+              key={index}
+              className={classnames(
+                'manual-posts__container',
+                { 'manual-posts__container--selected': manualPosts[index] },
+              )}
             >
               <span className="manual-posts__counter">{index + 1}</span>
               <PostPicker
@@ -332,7 +340,7 @@ export default function Edit({
           />
           {Object.keys(availableTaxonomies).length > 0 ? (
             allowedTaxonomies.map((taxonomy) => (
-              <>
+              <Fragment key={taxonomy}>
                 { /* @ts-ignore */ }
                 <TermSelector
                   label={availableTaxonomies[taxonomy].name || taxonomy}
@@ -354,7 +362,7 @@ export default function Edit({
                   />
                 ) : null}
                 <hr />
-              </>
+              </Fragment>
             ))
           ) : null}
           {taxCount > 1 ? (