diff --git a/public/app/features/dashboard/containers/DashboardPageProxy.tsx b/public/app/features/dashboard/containers/DashboardPageProxy.tsx
index e51a8ce9ad8..ee0ce912106 100644
--- a/public/app/features/dashboard/containers/DashboardPageProxy.tsx
+++ b/public/app/features/dashboard/containers/DashboardPageProxy.tsx
@@ -43,10 +43,6 @@ function DashboardPageProxy(props: DashboardPageProxyProps) {
     return stateManager.fetchDashboard({ route: props.route.routeName as DashboardRoutes, uid: params.uid ?? '' });
   }, [params.uid, props.route.routeName]);
 
-  if (!config.featureToggles.dashboardSceneForViewers) {
-    return <DashboardPage {...props} params={params} location={location} />;
-  }
-
   if (dashboard.loading) {
     return null;
   }
@@ -55,6 +51,10 @@ function DashboardPageProxy(props: DashboardPageProxyProps) {
     return null;
   }
 
+  if (!config.featureToggles.dashboardSceneForViewers) {
+    return <DashboardPage {...props} params={params} location={location} />;
+  }
+
   if (
     dashboard.value &&
     !(dashboard.value.meta?.canEdit || dashboard.value.meta?.canMakeEditable) &&