diff --git a/packages/next/src/client/components/errors/attach-hydration-error-state.ts b/packages/next/src/client/components/errors/attach-hydration-error-state.ts
index ef98ddf547a8a..9d78b7b1fd4ce 100644
--- a/packages/next/src/client/components/errors/attach-hydration-error-state.ts
+++ b/packages/next/src/client/components/errors/attach-hydration-error-state.ts
@@ -1,5 +1,6 @@
 import {
   getDefaultHydrationErrorMessage,
+  isHydrationError,
   testReactHydrationWarning,
 } from '../is-hydration-error'
 import {
@@ -13,24 +14,42 @@ export function attachHydrationErrorState(error: Error) {
   )
   let parsedHydrationErrorState: typeof hydrationErrorState = {}
   const isHydrationWarning = testReactHydrationWarning(error.message)
+  const isHydrationRuntimeError = isHydrationError(error)
   // If the reactHydrationDiffSegments exists
   // and the diff (reactHydrationDiffSegments[1]) exists
   // e.g. the hydration diff log error.
-  if (reactHydrationDiffSegments && reactHydrationDiffSegments[1]) {
+  if (reactHydrationDiffSegments) {
+    const diff = reactHydrationDiffSegments[1]
     parsedHydrationErrorState = {
       ...(error as any).details,
       ...hydrationErrorState,
-      warning: hydrationErrorState.warning || [
-        getDefaultHydrationErrorMessage(),
-      ],
+      // If diff is present in error, we don't need to pick up the console logged warning.
+      // - if hydration error has diff, and is not hydration diff log, then it's a normal hydration error.
+      // - if hydration error no diff, then leverage the one from the hydration diff log.
+
+      warning: (diff && !isHydrationWarning
+        ? null
+        : hydrationErrorState.warning) || [getDefaultHydrationErrorMessage()],
+      // When it's hydration diff log, do not show notes section.
+      // This condition is only for the 1st squashed error.
       notes: isHydrationWarning ? '' : reactHydrationDiffSegments[0],
-      reactOutputComponentDiff: reactHydrationDiffSegments[1],
+      reactOutputComponentDiff: diff,
     }
     // Cache the `reactOutputComponentDiff` into hydrationErrorState.
     // This is only required for now when we still squashed the hydration diff log into hydration error.
     // Once the all error is logged to dev overlay in order, this will go away.
-    hydrationErrorState.reactOutputComponentDiff =
-      parsedHydrationErrorState.reactOutputComponentDiff
+    if (!hydrationErrorState.reactOutputComponentDiff && diff) {
+      hydrationErrorState.reactOutputComponentDiff = diff
+    }
+    // If it's hydration runtime error that doesn't contain the diff, combine the diff from the cached hydration diff.
+    if (
+      !diff &&
+      isHydrationRuntimeError &&
+      hydrationErrorState.reactOutputComponentDiff
+    ) {
+      parsedHydrationErrorState.reactOutputComponentDiff =
+        hydrationErrorState.reactOutputComponentDiff
+    }
   } else {
     // Normal runtime error, where it doesn't contain the hydration diff.
 
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-pagination/error-overlay-pagination.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-pagination/error-overlay-pagination.tsx
index ddb75de22f554..209568feb78f5 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-pagination/error-overlay-pagination.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-pagination/error-overlay-pagination.tsx
@@ -118,6 +118,7 @@ export function ErrorOverlayPagination({
         disabled={activeIdx === 0}
         aria-disabled={activeIdx === 0}
         onClick={handlePrevious}
+        data-nextjs-dialog-error-previous
         className="error-overlay-pagination-button"
       >
         <LeftArrow
@@ -126,7 +127,7 @@ export function ErrorOverlayPagination({
         />
       </button>
       <div className="error-overlay-pagination-count">
-        <span>{activeIdx + 1}/</span>
+        <span data-nextjs-dialog-error-index={activeIdx}>{activeIdx + 1}/</span>
         <span data-nextjs-dialog-header-total-count>
           {/* Display 1 out of 1 if there are no errors (e.g. for build errors). */}
           {readyErrors.length || 1}
@@ -139,6 +140,7 @@ export function ErrorOverlayPagination({
         disabled={activeIdx >= readyErrors.length - 1}
         aria-disabled={activeIdx >= readyErrors.length - 1}
         onClick={handleNext}
+        data-nextjs-dialog-error-next
         className="error-overlay-pagination-button"
       >
         <RightArrow
diff --git a/packages/next/src/client/components/react-dev-overlay/internal/components/LeftRightDialogHeader/LeftRightDialogHeader.tsx b/packages/next/src/client/components/react-dev-overlay/internal/components/LeftRightDialogHeader/LeftRightDialogHeader.tsx
index 3db38e9967a2d..060a4f74b9dc9 100644
--- a/packages/next/src/client/components/react-dev-overlay/internal/components/LeftRightDialogHeader/LeftRightDialogHeader.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/internal/components/LeftRightDialogHeader/LeftRightDialogHeader.tsx
@@ -106,6 +106,7 @@ const LeftRightDialogHeader: React.FC<LeftRightDialogHeaderProps> =
           <button
             ref={buttonLeft}
             type="button"
+            data-nextjs-dialog-error-previous
             disabled={previous == null ? true : undefined}
             aria-disabled={previous == null ? true : undefined}
             onClick={previous ?? undefined}
@@ -128,6 +129,7 @@ const LeftRightDialogHeader: React.FC<LeftRightDialogHeaderProps> =
           <button
             ref={buttonRight}
             type="button"
+            data-nextjs-dialog-error-next
             disabled={next == null ? true : undefined}
             aria-disabled={next == null ? true : undefined}
             onClick={next ?? undefined}
diff --git a/packages/next/src/client/components/react-dev-overlay/internal/container/Errors.tsx b/packages/next/src/client/components/react-dev-overlay/internal/container/Errors.tsx
index 20af7b7775edb..2e9d8a202a5d4 100644
--- a/packages/next/src/client/components/react-dev-overlay/internal/container/Errors.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/internal/container/Errors.tsx
@@ -309,7 +309,10 @@ export function Errors({
               close={isServerError ? undefined : minimize}
             >
               <small>
-                <span>{activeIdx + 1}</span> of{' '}
+                <span data-nextjs-dialog-error-index={activeIdx}>
+                  {activeIdx + 1}
+                </span>{' '}
+                of{' '}
                 <span data-nextjs-dialog-header-total-count>
                   {readyErrors.length}
                 </span>
diff --git a/test/development/acceptance-app/hydration-error.test.ts b/test/development/acceptance-app/hydration-error.test.ts
index f997e4a0f8be0..7eeb171b5ec5e 100644
--- a/test/development/acceptance-app/hydration-error.test.ts
+++ b/test/development/acceptance-app/hydration-error.test.ts
@@ -443,10 +443,9 @@ describe('Error overlay for hydration errors in App router', () => {
     })
 
     // FIXME: Should also have "text nodes cannot be a child of tr"
-    expect(await session.getRedboxDescription()).toMatchInlineSnapshot(`
-     "In HTML, text nodes cannot be a child of <tr>.
-     This will cause a hydration error."
-    `)
+    expect(await session.getRedboxDescription()).toMatchInlineSnapshot(
+      `"Hydration failed because the server rendered HTML didn't match the client. As a result this tree will be regenerated on the client. This can happen if a SSR-ed Client Component used:"`
+    )
 
     const pseudoHtml = await session.getRedboxComponentStack()
     expect(pseudoHtml).toMatchInlineSnapshot(`
diff --git a/test/development/acceptance/hydration-error.test.ts b/test/development/acceptance/hydration-error.test.ts
index f1891369b7b02..204d443d52cfe 100644
--- a/test/development/acceptance/hydration-error.test.ts
+++ b/test/development/acceptance/hydration-error.test.ts
@@ -430,10 +430,10 @@ describe('Error overlay for hydration errors in Pages router', () => {
         `"Expected server HTML to contain a matching <table> in <div>."`
       )
     } else {
-      expect(await session.getRedboxDescription()).toMatchInlineSnapshot(`
-       "In HTML, text nodes cannot be a child of <tr>.
-       This will cause a hydration error."
-      `)
+      // FIXME: should show "Expected server HTML to contain a matching <table> in <div>." first
+      expect(await session.getRedboxDescription()).toMatchInlineSnapshot(
+        `"Hydration failed because the server rendered HTML didn't match the client. As a result this tree will be regenerated on the client. This can happen if a SSR-ed Client Component used:"`
+      )
     }
 
     const pseudoHtml = await session.getRedboxComponentStack()
@@ -497,10 +497,9 @@ describe('Error overlay for hydration errors in Pages router', () => {
 
       expect(await getRedboxTotalErrorCount(browser)).toBe(3)
     } else {
-      expect(await session.getRedboxDescription()).toMatchInlineSnapshot(`
-       "In HTML, text nodes cannot be a child of <table>.
-       This will cause a hydration error."
-      `)
+      expect(await session.getRedboxDescription()).toMatchInlineSnapshot(
+        `"Hydration failed because the server rendered HTML didn't match the client. As a result this tree will be regenerated on the client. This can happen if a SSR-ed Client Component used:"`
+      )
 
       const pseudoHtml = await session.getRedboxComponentStack()
       if (isTurbopack) {
diff --git a/test/development/app-dir/hydration-error-count/app/two-issues/page.tsx b/test/development/app-dir/hydration-error-count/app/two-issues/page.tsx
new file mode 100644
index 0000000000000..9c565fea30c4e
--- /dev/null
+++ b/test/development/app-dir/hydration-error-count/app/two-issues/page.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+// This page has two hydrations issues:
+// - bad nested tags
+// - server client mismatch
+export default function Page() {
+  const clx = typeof window === 'undefined' ? 'server' : 'client'
+  return (
+    <p className={clx}>
+      <p>nest</p>
+    </p>
+  )
+}
diff --git a/test/development/app-dir/hydration-error-count/hydration-error-count.test.ts b/test/development/app-dir/hydration-error-count/hydration-error-count.test.ts
index 54442ffe8a340..269ed2f449637 100644
--- a/test/development/app-dir/hydration-error-count/hydration-error-count.test.ts
+++ b/test/development/app-dir/hydration-error-count/hydration-error-count.test.ts
@@ -1,5 +1,15 @@
 import { nextTestSetup } from 'e2e-utils'
-import { hasErrorToast, getToastErrorCount, retry } from 'next-test-utils'
+import {
+  hasErrorToast,
+  getToastErrorCount,
+  retry,
+  openRedbox,
+  getRedboxDescription,
+  getRedboxComponentStack,
+  goToNextErrorView,
+  getRedboxDescriptionWarning,
+} from 'next-test-utils'
+import { BrowserInterface } from 'next-webdriver'
 
 describe('hydration-error-count', () => {
   const { next } = nextTestSetup({
@@ -30,4 +40,87 @@ describe('hydration-error-count', () => {
       expect(totalErrorCount).toBe(1)
     })
   })
+
+  it('should display correct hydration info in each hydration error view', async () => {
+    const browser = await next.browser('/two-issues')
+
+    await openRedbox(browser)
+
+    const firstError = await getHydrationErrorSnapshot(browser)
+    await goToNextErrorView(browser)
+    const secondError = await getHydrationErrorSnapshot(browser)
+
+    // Hydration runtime error
+    // - contains a diff
+    // - has notes
+    expect(firstError).toMatchInlineSnapshot(`
+     {
+       "description": "Hydration failed because the server rendered HTML didn't match the client. As a result this tree will be regenerated on the client. This can happen if a SSR-ed Client Component used:",
+       "diff": "...
+         <OuterLayoutRouter parallelRouterKey="children" template={<RenderFromTemplateContext>}>
+           <RenderFromTemplateContext>
+             <ScrollAndFocusHandler segmentPath={[...]}>
+               <InnerScrollAndFocusHandler segmentPath={[...]} focusAndScrollRef={{apply:false, ...}}>
+                 <ErrorBoundary errorComponent={undefined} errorStyles={undefined} errorScripts={undefined}>
+                   <LoadingBoundary loading={null}>
+                     <HTTPAccessFallbackBoundary notFound={undefined} forbidden={undefined} unauthorized={undefined}>
+                       <RedirectBoundary>
+                         <RedirectErrorBoundary router={{...}}>
+                           <InnerLayoutRouter url="/two-issues" tree={[...]} cacheNode={{lazyData:null, ...}} ...>
+                             <ClientPageRoot Component={function Page} searchParams={{}} params={{}}>
+                               <Page params={Promise} searchParams={Promise}>
+                                 <p
+     +                             className="client"
+     -                             className="server"
+                                 >
+                             ...",
+       "notes": "- A server/client branch \`if (typeof window !== 'undefined')\`.
+     - Variable input such as \`Date.now()\` or \`Math.random()\` which changes each time it's called.
+     - Date formatting in a user's locale which doesn't match the server.
+     - External changing data without sending a snapshot of it along with the HTML.
+     - Invalid HTML tag nesting.
+
+     It can also happen if the client has a browser extension installed which messes with the HTML before React loaded.",
+     }
+    `)
+
+    // Hydration console.error
+    // - contains a diff
+    // - no notes
+    expect(secondError).toMatchInlineSnapshot(`
+     {
+       "description": "In HTML, <p> cannot be a descendant of <p>.
+     This will cause a hydration error.",
+       "diff": "...
+         <OuterLayoutRouter parallelRouterKey="children" template={<RenderFromTemplateContext>}>
+           <RenderFromTemplateContext>
+             <ScrollAndFocusHandler segmentPath={[...]}>
+               <InnerScrollAndFocusHandler segmentPath={[...]} focusAndScrollRef={{apply:false, ...}}>
+                 <ErrorBoundary errorComponent={undefined} errorStyles={undefined} errorScripts={undefined}>
+                   <LoadingBoundary loading={null}>
+                     <HTTPAccessFallbackBoundary notFound={undefined} forbidden={undefined} unauthorized={undefined}>
+                       <RedirectBoundary>
+                         <RedirectErrorBoundary router={{...}}>
+                           <InnerLayoutRouter url="/two-issues" tree={[...]} cacheNode={{lazyData:null, ...}} ...>
+                             <ClientPageRoot Component={function Page} searchParams={{}} params={{}}>
+                               <Page params={Promise} searchParams={Promise}>
+     >                           <p className="client">
+     >                             <p>
+                             ...",
+       "notes": undefined,
+     }
+    `)
+  })
 })
+
+async function getHydrationErrorSnapshot(browser: BrowserInterface) {
+  const description = await getRedboxDescription(browser)
+  const notes = await getRedboxDescriptionWarning(browser)
+  const diff = await getRedboxComponentStack(browser)
+
+  return {
+    description,
+    notes,
+    diff,
+  }
+}
diff --git a/test/lib/next-test-utils.ts b/test/lib/next-test-utils.ts
index 7d751ef9cfc1f..5b752cfe717d7 100644
--- a/test/lib/next-test-utils.ts
+++ b/test/lib/next-test-utils.ts
@@ -944,6 +944,27 @@ export async function openRedbox(browser: BrowserInterface): Promise<void> {
   await assertHasRedbox(browser)
 }
 
+export async function goToNextErrorView(
+  browser: BrowserInterface
+): Promise<void> {
+  try {
+    const currentErrorIndex = await browser
+      .elementByCss('[data-nextjs-dialog-error-index]')
+      .text()
+    await browser.elementByCss('[data-nextjs-dialog-error-next]').click()
+    await retry(async () => {
+      const nextErrorIndex = await browser
+        .elementByCss('[data-nextjs-dialog-error-index]')
+        .text()
+      expect(nextErrorIndex).not.toBe(currentErrorIndex)
+    })
+  } catch (cause) {
+    const error = new Error('No Redbox to open.', { cause })
+    Error.captureStackTrace(error, openRedbox)
+    throw error
+  }
+}
+
 export async function openDevToolsIndicatorPopover(
   browser: BrowserInterface
 ): Promise<void> {