diff --git a/public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx b/public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx
index c7ef6562fdb..11d7b5513ff 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx
@@ -85,7 +85,9 @@ export const PanelOptionsTab: FC<Props> = ({
   }
 
   if (plugin.angularPanelCtrl) {
-    elements.push(<AngularPanelOptions panel={panel} dashboard={dashboard} plugin={plugin} />);
+    elements.push(
+      <AngularPanelOptions panel={panel} dashboard={dashboard} plugin={plugin} key="angular panel options" />
+    );
   }
 
   elements.push(
diff --git a/public/app/features/dashboard/components/PanelEditor/state/actions.ts b/public/app/features/dashboard/components/PanelEditor/state/actions.ts
index 56a4ea8c85f..71043d3aa1d 100644
--- a/public/app/features/dashboard/components/PanelEditor/state/actions.ts
+++ b/public/app/features/dashboard/components/PanelEditor/state/actions.ts
@@ -54,7 +54,10 @@ export function panelEditorCleanUp(): ThunkResult<void> {
       // Resend last query result on source panel query runner
       // But do this after the panel edit editor exit process has completed
       setTimeout(() => {
-        sourcePanel.getQueryRunner().pipeDataToSubject(panel.getQueryRunner().getLastResult());
+        const lastResult = panel.getQueryRunner().getLastResult();
+        if (lastResult) {
+          sourcePanel.getQueryRunner().pipeDataToSubject(lastResult);
+        }
       }, 20);
     }