diff --git a/public/app/AppWrapper.tsx b/public/app/AppWrapper.tsx
index 95c0477196a..73a370a25dc 100644
--- a/public/app/AppWrapper.tsx
+++ b/public/app/AppWrapper.tsx
@@ -95,7 +95,7 @@ export class AppWrapper extends React.Component<AppWrapperProps, AppWrapperState
                   <GlobalStyles />
                   <div className="grafana-app">
                     <Router history={locationService.getHistory()}>
-                      {newNavigationEnabled ? <NavBarNext /> : <NavBar />}
+                      {ready && <>{newNavigationEnabled ? <NavBarNext /> : <NavBar />}</>}
                       <main className="main-view">
                         {pageBanners.map((Banner, index) => (
                           <Banner key={index.toString()} />