diff --git a/.changeset/cold-cameras-work.md b/.changeset/cold-cameras-work.md
new file mode 100644
index 000000000..5eed9ac12
--- /dev/null
+++ b/.changeset/cold-cameras-work.md
@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Don't add extra page scroll when footer is not present
diff --git a/packages/gitbook/src/app/middleware/(site)/(content)/[[...pathname]]/not-found.tsx b/packages/gitbook/src/app/middleware/(site)/(content)/[[...pathname]]/not-found.tsx
index cd36e5b26..d218b9aa2 100644
--- a/packages/gitbook/src/app/middleware/(site)/(content)/[[...pathname]]/not-found.tsx
+++ b/packages/gitbook/src/app/middleware/(site)/(content)/[[...pathname]]/not-found.tsx
@@ -15,7 +15,15 @@ export default async function NotFound() {
 
     return (
         <div
-            className={tcls('flex-1', 'flex', 'flex-row', 'items-center', 'justify-center', 'py-9')}
+            className={tcls(
+                'flex-1',
+                'flex',
+                'flex-row',
+                'items-center',
+                'justify-center',
+                'py-9',
+                'min-h-[calc(100vh-64px)] lg:min-h-fit',
+            )}
         >
             <div className={tcls('max-w-80')}>
                 <h2 className={tcls('text-2xl', 'font-semibold', 'mb-2')}>
diff --git a/packages/gitbook/src/components/SpaceLayout/SpaceLayout.tsx b/packages/gitbook/src/components/SpaceLayout/SpaceLayout.tsx
index a214c22d8..4dc5be4fb 100644
--- a/packages/gitbook/src/components/SpaceLayout/SpaceLayout.tsx
+++ b/packages/gitbook/src/components/SpaceLayout/SpaceLayout.tsx
@@ -78,6 +78,12 @@ export async function SpaceLayout(props: {
     const visitorAuthToken = await getCurrentVisitorToken();
     const enabled = await shouldTrackEvents();
 
+    const withFooter =
+        customization.themes.toggeable ||
+        customization.footer.copyright ||
+        customization.footer.logo ||
+        customization.footer.groups?.length;
+
     return (
         <InsightsProvider
             enabled={enabled}
@@ -103,7 +109,7 @@ export async function SpaceLayout(props: {
                         CONTAINER_STYLE,
 
                         // Ensure the footer is display below the viewport even if the content is not enough
-                        `min-h-[calc(100vh-64px)]`,
+                        withFooter && 'min-h-[calc(100vh-64px)]',
                         withTopHeader ? null : 'lg:min-h-screen',
                     )}
                 >
@@ -174,10 +180,7 @@ export async function SpaceLayout(props: {
                 </div>
             </div>
 
-            {customization.themes.toggeable ||
-            customization.footer.copyright ||
-            customization.footer.logo ||
-            customization.footer.groups?.length ? (
+            {withFooter ? (
                 <Footer space={space} context={contentRefContext} customization={customization} />
             ) : null}