diff --git a/src/renderer/app.tsx b/src/renderer/app.tsx
index d32580dc0..2e6cfd02b 100644
--- a/src/renderer/app.tsx
+++ b/src/renderer/app.tsx
@@ -22,12 +22,7 @@ import { WebAudio } from '/@/shared/types/types';
 import '/@/shared/styles/global.css';
 import { PlayerProvider } from '/@/renderer/features/player/context/player-context';
 import { AudioPlayers } from '/@/renderer/features/player/components/audio-players';
-
-const ReleaseNotesModal = lazy(() =>
-    import('./release-notes-modal').then((module) => ({
-        default: module.ReleaseNotesModal,
-    })),
-);
+import { ReleaseNotesModal } from '/@/renderer/release-notes-modal';
 
 const UpdateAvailableDialog = lazy(() =>
     import('./update-available-dialog').then((module) => ({
@@ -82,8 +77,8 @@ const AppShell = memo(function AppShell() {
                     <AppRouter />
                 </PlayerProvider>
             </WebAudioContext.Provider>
+            <ReleaseNotesModal />
             <Suspense fallback={null}>
-                <ReleaseNotesModal />
                 <UpdateAvailableDialog />
             </Suspense>
         </>
diff --git a/src/renderer/layouts/mobile-layout/mobile-layout.tsx b/src/renderer/layouts/mobile-layout/mobile-layout.tsx
index b08d694a3..39d39db29 100644
--- a/src/renderer/layouts/mobile-layout/mobile-layout.tsx
+++ b/src/renderer/layouts/mobile-layout/mobile-layout.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 import { AnimatePresence } from 'motion/react';
-import { lazy, Suspense } from 'react';
+import { Suspense } from 'react';
 import { Outlet } from 'react-router';
 
 import styles from './mobile-layout.module.css';
@@ -10,6 +10,7 @@ import { FullScreenVisualizer } from '/@/renderer/features/player/components/ful
 import { MobileFullscreenPlayer } from '/@/renderer/features/player/components/mobile-fullscreen-player';
 import { MobileSidebar } from '/@/renderer/features/sidebar/components/mobile-sidebar';
 import { PlayerBar } from '/@/renderer/layouts/default-layout/player-bar';
+import { WindowBar } from '/@/renderer/layouts/window-bar';
 import { useFullScreenPlayerOverlayState, useWindowBarStyle } from '/@/renderer/store';
 import { ActionIcon } from '/@/shared/components/action-icon/action-icon';
 import { Drawer } from '/@/shared/components/drawer/drawer';
@@ -17,12 +18,6 @@ import { Spinner } from '/@/shared/components/spinner/spinner';
 import { useDisclosure } from '/@/shared/hooks/use-disclosure';
 import { Platform } from '/@/shared/types/types';
 
-const WindowBar = lazy(() =>
-    import('/@/renderer/layouts/window-bar').then((module) => ({
-        default: module.WindowBar,
-    })),
-);
-
 interface MobileLayoutProps {
     shell?: boolean;
 }
diff --git a/src/renderer/router/app-router.tsx b/src/renderer/router/app-router.tsx
index a44016cd2..9bec7ac28 100644
--- a/src/renderer/router/app-router.tsx
+++ b/src/renderer/router/app-router.tsx
@@ -1,6 +1,7 @@
 import { lazy, Suspense } from 'react';
 import { HashRouter, Route, Routes } from 'react-router';
 
+import { ShuffleAllContextModal } from '/@/renderer/features/player/components/shuffle-all-modal';
 import { RouterErrorBoundary } from '/@/renderer/features/shared/components/router-error-boundary';
 import { AuthenticationOutlet } from '/@/renderer/layouts/authentication-outlet';
 import { ResponsiveLayout } from '/@/renderer/layouts/responsive-layout';
@@ -96,18 +97,6 @@ const LyricsSettingsContextModal = (props: any) => (
     </Suspense>
 );
 
-const LazyShuffleAllContextModal = lazy(() =>
-    import('/@/renderer/features/player/components/shuffle-all-modal').then((module) => ({
-        default: module.ShuffleAllContextModal,
-    })),
-);
-
-const ShuffleAllContextModal = (props: any) => (
-    <Suspense fallback={<Spinner container />}>
-        <LazyShuffleAllContextModal {...props} />
-    </Suspense>
-);
-
 const LazyAddToPlaylistContextModal = lazy(() =>
     import('/@/renderer/features/playlists/components/add-to-playlist-context-modal').then(
         (module) => ({