diff --git a/public/app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge.tsx b/public/app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge.tsx
index 9cab7a7ab2a..36ee44d14de 100644
--- a/public/app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge.tsx
+++ b/public/app/features/dashboard-scene/scene/new-toolbar/actions/PublicDashboardBadge.tsx
@@ -18,19 +18,14 @@ export const PublicDashboardBadge = ({ dashboard }: ToolbarActionProps) => {
 // Used in old architecture
 export const PublicDashboardBadgeLegacy = PublicDashboardBadgeInternal;
 
-function PublicDashboardBadgeInternal({ uid }: { uid?: string }) {
-  if (!uid) {
-    return null;
-  }
-
+function PublicDashboardBadgeInternal({ uid }: { uid: string }) {
   const { data: publicDashboard } = useGetPublicDashboardQuery(uid);
+  const styles = useStyles2(getStyles);
 
   if (!publicDashboard) {
     return null;
   }
 
-  const styles = useStyles2(getStyles);
-
   return (
     <Badge
       color="blue"
diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx
index 0999d86780e..aeb072faf93 100644
--- a/public/app/features/dashboard/components/DashNav/DashNav.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx
@@ -212,7 +212,9 @@ export const DashNav = memo<Props>((props) => {
       );
     }
 
-    buttons.push(<PublicDashboardBadgeLegacy key="public-dashboard-badge" uid={dashboard.uid} />);
+    if (dashboard.uid) {
+      buttons.push(<PublicDashboardBadgeLegacy key="public-dashboard-badge" uid={dashboard.uid} />);
+    }
 
     if (isDevEnv && config.featureToggles.dashboardScene) {
       buttons.push(