diff --git a/assets/components/tracking/connector/ConnectorsList.tsx b/assets/components/tracking/connector/ConnectorsList.tsx
index 0df8af5..a874d4c 100644
--- a/assets/components/tracking/connector/ConnectorsList.tsx
+++ b/assets/components/tracking/connector/ConnectorsList.tsx
@@ -22,16 +22,16 @@ export function ConnectorsList({connectors, onDelete}: { connectors: ConnectorEl
         <>
             <Divider/>
             {connectors.map(connector => {
-                    const createdAt = <Typography.Text strong>
+                    const createdAt = <Typography.Text strong key={"createdAt"}>
                         {new Date(connector.createdAt).toLocaleString()}
                     </Typography.Text>
                     const {watchlistCount} = connector
                     const connectorName = Object.keys(ConnectorProvider).find(p => ConnectorProvider[p as keyof typeof ConnectorProvider] === connector.provider)
 
-                    return <>
-                        {contextHolder}
-                        <Card
-                            hoverable title={<Space>
+                    return <Card
+                            hoverable
+                            key={connector.id}
+                            title={<Space>
                             {t`Connector ${connectorName}`}<Typography.Text code>{connector.id}</Typography.Text>
                         </Space>}
                             size='small'
@@ -45,6 +45,7 @@ export function ConnectorsList({connectors, onDelete}: { connectors: ConnectorEl
                             ><DeleteFilled style={{color: token.colorError}}/>
                             </Popconfirm>}
                         >
+                            {contextHolder}
                             <Typography.Paragraph>{jt`Creation date: ${createdAt}`}</Typography.Paragraph>
                             <Typography.Paragraph>{t`Used in: ${watchlistCount} Watchlist`}</Typography.Paragraph>
                             <Card.Meta description={
@@ -58,7 +59,6 @@ The creation date corresponds to the date on which you consented to the creation
                                 </>
                             }/>
                         </Card>
-                    </>
                 }
             )}
         </>
diff --git a/assets/components/tracking/watchlist/TrackedDomainTable.tsx b/assets/components/tracking/watchlist/TrackedDomainTable.tsx
index cecceac..ef14923 100644
--- a/assets/components/tracking/watchlist/TrackedDomainTable.tsx
+++ b/assets/components/tracking/watchlist/TrackedDomainTable.tsx
@@ -28,6 +28,7 @@ export function TrackedDomainTable() {
     const REDEMPTION_NOTICE = (
         <Tooltip
             title={t`At least one domain name is in redemption period and will potentially be deleted soon`}
+            key="redeptionNotice"
         >
             <Tag color={eppStatusCodeToColor('redemption period')}>redemption period</Tag>
         </Tooltip>
@@ -36,6 +37,7 @@ export function TrackedDomainTable() {
     const PENDING_DELETE_NOTICE = (
         <Tooltip
             title={t`At least one domain name is pending deletion and will soon become available for registration again`}
+            key="pendingDeleteNotice"
         >
             <Tag color={eppStatusCodeToColor('pending delete')}>pending delete</Tag>
         </Tooltip>
@@ -222,6 +224,7 @@ export function TrackedDomainTable() {
                 text: <Tooltip
                     placement='bottomLeft'
                     title={rdapStatusCodeDetailTranslated[s as keyof typeof rdapStatusCodeDetailTranslated] || undefined}
+                    key={s}
                 >
                     <Tag color={eppStatusCodeToColor(s)}>{s}</Tag>
                 </Tooltip>,
diff --git a/assets/utils/functions/StatusToTag.tsx b/assets/utils/functions/StatusToTag.tsx
index bf46bb2..7ae1164 100644
--- a/assets/utils/functions/StatusToTag.tsx
+++ b/assets/utils/functions/StatusToTag.tsx
@@ -10,6 +10,7 @@ export function statusToTag(s: string) {
         <Tooltip
             placement='bottomLeft'
             title={rdapStatusCodeDetailTranslated[s as keyof typeof rdapStatusCodeDetailTranslated] || undefined}
+            key={s}
         >
             <Tag color={eppStatusCodeToColor(s)}>{s}</Tag>
         </Tooltip>