diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index a8369748..3b00f577 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -4,21 +4,17 @@ import { clsx } from 'clsx/lite';
 import { IBM_Plex_Mono } from 'next/font/google';
 import { BASE_URL, SITE_DESCRIPTION, SITE_TITLE } from '@/site/config';
 import AppStateProvider from '@/state/AppStateProvider';
-import Nav from '@/site/Nav';
 import ToasterWithThemes from '@/toast/ToasterWithThemes';
 import PhotoEscapeHandler from '@/photo/PhotoEscapeHandler';
-import Footer from '@/site/Footer';
-import { Suspense } from 'react';
-import FooterClient from '@/site/FooterClient';
-import NavClient from '@/site/NavClient';
 import { Metadata } from 'next/types';
 import MoreComponentsProvider from '@/state/MoreComponentsProvider';
-import CommandK from '@/site/CommandK';
-import CommandKClient from '@/components/CommandKClient';
 import { ThemeProvider } from 'next-themes';
 
 import '../site/globals.css';
 import '../site/sonner.css';
+import NavClient from '@/site/NavClient';
+import CommandKClient from '@/components/CommandKClient';
+import FooterClient from '@/site/FooterClient';
 
 const ibmPlexMono = IBM_Plex_Mono({
   subsets: ['latin'],
@@ -82,22 +78,16 @@ export default function RootLayout({
                 'mx-3 mb-3',
                 'lg:mx-6 lg:mb-6',
               )}>
-                <Suspense fallback={<NavClient />}>
-                  <Nav />
-                </Suspense>
+                <NavClient />
                 <div className={clsx(
                   'min-h-[16rem] sm:min-h-[30rem]',
                   'mb-12',
                 )}>
                   {children}
                 </div>
-                <Suspense fallback={<FooterClient />}>
-                  <Footer />
-                </Suspense>
+                <FooterClient />
               </main>
-              <Suspense fallback={<CommandKClient />}>
-                <CommandK />
-              </Suspense>
+              <CommandKClient />
             </ThemeProvider>
           </MoreComponentsProvider>
           <Analytics debug={false} />
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 9c3d681e..f26d5e2c 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -7,7 +7,6 @@ import PhotosEmptyState from '@/photo/PhotosEmptyState';
 import { Metadata } from 'next/types';
 import { MAX_PHOTOS_TO_SHOW_OG } from '@/image-response';
 import PhotosLarge from '@/photo/PhotosLarge';
-import { Suspense } from 'react';
 import { MorePhotosRoot } from '@/photo/MorePhotosRoot';
 
 export const revalidate = 3600;
@@ -36,13 +35,11 @@ export default async function HomePage() {
           photos={photos}
           prefetchFirstPhotoLinks={true}
         />
-        <Suspense>
-          <MorePhotosRoot
-            initialOffset={INFINITE_SCROLL_MULTIPLE_HOME}
-            itemsPerRequest={INFINITE_SCROLL_MULTIPLE_HOME}
-            totalPhotosCount={count}
-          />
-        </Suspense>
+        <MorePhotosRoot
+          initialOffset={INFINITE_SCROLL_MULTIPLE_HOME}
+          itemsPerRequest={INFINITE_SCROLL_MULTIPLE_HOME}
+          totalPhotosCount={count}
+        />
       </div>
       : <PhotosEmptyState />
   );