diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx
index 3253dc59ba6..c800ccea7c6 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx
@@ -112,7 +112,7 @@ export const DataLinksInlineEditor = ({
                 const key = `${link.title}/${idx}`;
 
                 const linkJSX = (
-                  <div className={styles.itemWrapper}>
+                  <div className={styles.itemWrapper} key={key}>
                     <DataLinksListItem
                       key={key}
                       index={idx}
diff --git a/public/app/features/canvas/runtime/element.tsx b/public/app/features/canvas/runtime/element.tsx
index f16daaddee1..34083445bd4 100644
--- a/public/app/features/canvas/runtime/element.tsx
+++ b/public/app/features/canvas/runtime/element.tsx
@@ -373,6 +373,8 @@ export class ElementState implements LayerElement {
     const scene = this.getScene();
     const frames = scene?.data?.series;
 
+    this.options.links = this.options.links?.filter((link) => link !== null);
+
     if (frames) {
       const defaultField = {
         name: 'Default field',
diff --git a/public/app/plugins/panel/canvas/migrations.ts b/public/app/plugins/panel/canvas/migrations.ts
index 527782bd142..c4fe614aab3 100644
--- a/public/app/plugins/panel/canvas/migrations.ts
+++ b/public/app/plugins/panel/canvas/migrations.ts
@@ -54,7 +54,7 @@ export const canvasMigrationHandler = (panel: PanelModel): Partial<Options> => {
         // append override links to elements with dimensions mapped to same field name
         for (const prop of override.properties) {
           if (prop.id === 'links') {
-            addLinks(panel.options.root.elements, prop.value, override.matcher.options);
+            addLinks(panel.options.root.elements, prop.value ?? [], override.matcher.options);
           } else {
             props.push(prop);
           }