diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-footer/error-feedback/error-feedback.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-footer/error-feedback/error-feedback.tsx
index 1faa306e75717..b8df0dd1a3b56 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-footer/error-feedback/error-feedback.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-footer/error-feedback/error-feedback.tsx
@@ -71,8 +71,8 @@ export function ErrorFeedback({ errorCode }: ErrorFeedbackProps) {
 export const styles = css`
   .error-feedback {
     display: flex;
-    align-items: center;
     gap: var(--size-gap);
+    white-space: nowrap;
   }
 
   .error-feedback-thanks {
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-footer/error-overlay-footer.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-footer/error-overlay-footer.tsx
index 2beacc1c18368..d257ca8ad921a 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-footer/error-overlay-footer.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-footer/error-overlay-footer.tsx
@@ -3,8 +3,8 @@ import { styles as feedbackStyles } from './error-feedback/error-feedback'
 import { noop as css } from '../../../helpers/noop-template'
 
 export type ErrorOverlayFooterProps = {
-  errorCode: string
-  footerMessage?: string
+  errorCode: string | undefined
+  footerMessage: string | undefined
 }
 
 export function ErrorOverlayFooter({
@@ -13,8 +13,10 @@ export function ErrorOverlayFooter({
 }: ErrorOverlayFooterProps) {
   return (
     <footer className="error-overlay-footer">
-      <p className="error-overlay-footer-message">{footerMessage}</p>
-      <ErrorFeedback errorCode={errorCode} />
+      {footerMessage ? (
+        <p className="error-overlay-footer-message">{footerMessage}</p>
+      ) : null}
+      {errorCode ? <ErrorFeedback errorCode={errorCode} /> : null}
     </footer>
   )
 }
@@ -22,8 +24,10 @@ export function ErrorOverlayFooter({
 export const styles = css`
   .error-overlay-footer {
     display: flex;
-    align-items: center;
+    flex-direction: row;
     justify-content: space-between;
+
+    gap: var(--size-gap);
     padding: var(--size-3);
     background: var(--color-background-200);
     border-top: 1px solid var(--color-gray-400);
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.tsx
index 3a7cd86f83a03..445b0cf92c294 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.tsx
@@ -95,10 +95,9 @@ export function ErrorOverlayLayout({
           <ErrorOverlayDialogBody>{children}</ErrorOverlayDialogBody>
 
           <DialogFooter>
-            {/* TODO: errorCode should not be undefined whatsoever */}
             <ErrorOverlayFooter
               footerMessage={footerMessage}
-              errorCode={errorCode!}
+              errorCode={errorCode}
             />
             <ErrorOverlayBottomStacks
               errorsCount={readyErrors?.length ?? 0}