From 8943e7383db8ce643b895fc90a049e1afcab9487 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 31 Mar 2021 09:20:39 +0100
Subject: [PATCH] Dashboard: No longer includes default datasource when
 externally exporting dashboard with row (#32494) (#32535)

Closes #31065

(cherry picked from commit 230f95dc475d3872ea273e3ba173942e00c1050e)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
---
 .../dashboard/components/DashExportModal/DashboardExporter.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
index d3091a6938e..0b2a343909a 100644
--- a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
@@ -109,7 +109,7 @@ export class DashboardExporter {
     };
 
     const processPanel = (panel: PanelModel) => {
-      if (panel.datasource !== undefined) {
+      if (panel.datasource !== undefined && panel.datasource !== null) {
         templateizeDatasourceUsage(panel);
       }