diff --git a/public/app/features/dashboard-scene/sharing/ShareModal.tsx b/public/app/features/dashboard-scene/sharing/ShareModal.tsx
index a2c8aed0bbc..3ada3d1fd72 100644
--- a/public/app/features/dashboard-scene/sharing/ShareModal.tsx
+++ b/public/app/features/dashboard-scene/sharing/ShareModal.tsx
@@ -77,10 +77,10 @@ export class ShareModal extends SceneObjectBase<ShareModalState> implements Moda
 
     if (!panelRef) {
       tabs.push(...customDashboardTabs.map((Tab) => new Tab({ dashboardRef, modalRef })));
-    }
 
-    if (isPublicDashboardsEnabled()) {
-      tabs.push(new SharePublicDashboardTab({ dashboardRef, modalRef }));
+      if (isPublicDashboardsEnabled()) {
+        tabs.push(new SharePublicDashboardTab({ dashboardRef, modalRef }));
+      }
     }
 
     this.setState({ tabs });
diff --git a/public/app/features/dashboard/components/ShareModal/ShareModal.tsx b/public/app/features/dashboard/components/ShareModal/ShareModal.tsx
index 50d31b57025..ddbe9cfaa03 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareModal.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareModal.tsx
@@ -55,14 +55,14 @@ function getTabs(canEditDashboard: boolean, panel?: PanelModel, activeTab?: stri
       component: ShareExport,
     });
     tabs.push(...customDashboardTabs);
-  }
 
-  if (isPublicDashboardsEnabled()) {
-    tabs.push({
-      label: t('share-modal.tab-title.public-dashboard-title', 'Public dashboard'),
-      value: shareDashboardType.publicDashboard,
-      component: SharePublicDashboard,
-    });
+    if (isPublicDashboardsEnabled()) {
+      tabs.push({
+        label: t('share-modal.tab-title.public-dashboard-title', 'Public dashboard'),
+        value: shareDashboardType.publicDashboard,
+        component: SharePublicDashboard,
+      });
+    }
   }
 
   const at = tabs.find((t) => t.value === activeTab);
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/utilsTest.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/utilsTest.tsx
index fcac56a11c2..1434710a4ed 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/utilsTest.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/utilsTest.tsx
@@ -56,7 +56,6 @@ export const renderSharePublicDashboard = async (
 
   const newProps = Object.assign(
     {
-      panel: mockPanel,
       dashboard: mockDashboard,
       onDismiss: () => {},
     },