diff --git a/src/Components/Components/src/NavigationManager.cs b/src/Components/Components/src/NavigationManager.cs
index 25d6da65b94e..987482ece5a7 100644
--- a/src/Components/Components/src/NavigationManager.cs
+++ b/src/Components/Components/src/NavigationManager.cs
@@ -54,8 +54,6 @@ public event EventHandler<NotFoundEventArgs> OnNotFound
 
     private EventHandler<NotFoundEventArgs>? _notFound;
 
-    private static readonly NotFoundEventArgs _notFoundEventArgs = new NotFoundEventArgs();
-
     // For the baseUri it's worth storing as a System.Uri so we can do operations
     // on that type. System.Uri gives us access to the original string anyway.
     private Uri? _baseUri;
@@ -63,6 +61,8 @@ public event EventHandler<NotFoundEventArgs> OnNotFound
     // The URI. Always represented an absolute URI.
     private string? _uri;
     private bool _isInitialized;
+    internal string NotFoundPageRoute { get; set; } = string.Empty;
+    internal Type NotFoundPageType { get; set; } = default!;
 
     /// <summary>
     /// Gets or sets the current base URI. The <see cref="BaseUri" /> is always represented as an absolute URI in string form with trailing slash.
@@ -212,7 +212,7 @@ private void NotFoundCore()
         }
         else
         {
-            _notFound.Invoke(this, _notFoundEventArgs);
+            _notFound.Invoke(this, new NotFoundEventArgs(NotFoundPageRoute, NotFoundPageType)); // ToDo: sending only the type would be enough and then we would get the route later
         }
     }
 
diff --git a/src/Components/Components/src/PublicAPI.Unshipped.txt b/src/Components/Components/src/PublicAPI.Unshipped.txt
index 5eb52d2c330e..bb9da6e52ead 100644
--- a/src/Components/Components/src/PublicAPI.Unshipped.txt
+++ b/src/Components/Components/src/PublicAPI.Unshipped.txt
@@ -6,7 +6,9 @@ Microsoft.AspNetCore.Components.NavigationManager.OnNotFound -> System.EventHand
 Microsoft.AspNetCore.Components.NavigationManager.NotFound() -> void
 Microsoft.AspNetCore.Components.Routing.IHostEnvironmentNavigationManager.Initialize(string! baseUri, string! uri, System.Func<string!, System.Threading.Tasks.Task!>! onNavigateTo) -> void
 Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs
-Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs.NotFoundEventArgs() -> void
+Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs.NotFoundEventArgs(string! url, System.Type! notFoundPageType) -> void
+Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs.NotFoundPageType.get -> System.Type!
+Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs.Path.get -> string!
 Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager.ComponentStatePersistenceManager(Microsoft.Extensions.Logging.ILogger<Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager!>! logger, System.IServiceProvider! serviceProvider) -> void
 Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager.SetPlatformRenderMode(Microsoft.AspNetCore.Components.IComponentRenderMode! renderMode) -> void
 Microsoft.AspNetCore.Components.Infrastructure.RegisterPersistentComponentStateServiceCollectionExtensions
diff --git a/src/Components/Components/src/Routing/NotFoundEventArgs.cs b/src/Components/Components/src/Routing/NotFoundEventArgs.cs
index 637bfd442b70..07eca1a9c906 100644
--- a/src/Components/Components/src/Routing/NotFoundEventArgs.cs
+++ b/src/Components/Components/src/Routing/NotFoundEventArgs.cs
@@ -8,9 +8,23 @@ namespace Microsoft.AspNetCore.Components.Routing;
 /// </summary>
 public sealed class NotFoundEventArgs : EventArgs
 {
+    /// <summary>
+    /// Gets the path of NotFoundPage.
+    /// </summary>
+    public string Path { get; }
+
+    /// <summary>
+    /// Gets the type of NotFoundPage component.
+    /// </summary>
+    public Type NotFoundPageType { get; }
+
     /// <summary>
     /// Initializes a new instance of <see cref="NotFoundEventArgs" />.
     /// </summary>
-    public NotFoundEventArgs()
-    { }
+    public NotFoundEventArgs(string url, Type notFoundPageType)
+    {
+        Path = url;
+        NotFoundPageType = notFoundPageType;
+    }
+
 }
diff --git a/src/Components/Components/src/Routing/Router.cs b/src/Components/Components/src/Routing/Router.cs
index 7a73ead53ea9..0f815973a561 100644
--- a/src/Components/Components/src/Routing/Router.cs
+++ b/src/Components/Components/src/Routing/Router.cs
@@ -18,6 +18,7 @@ namespace Microsoft.AspNetCore.Components.Routing;
 /// <summary>
 /// A component that supplies route data corresponding to the current navigation state.
 /// </summary>
+[StreamRendering]
 public partial class Router : IComponent, IHandleAfterRender, IDisposable
 {
     // Dictionary is intentionally used instead of ReadOnlyDictionary to reduce Blazor size
diff --git a/src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs b/src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs
index a52f6e274410..8e5338f54788 100644
--- a/src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs
+++ b/src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs
@@ -111,13 +111,6 @@ await _renderer.InitializeStandardComponentServicesAsync(
             ParameterView.Empty,
             waitForQuiescence: result.IsPost || isErrorHandlerOrReExecuted);
 
-        bool avoidStartingResponse = hasStatusCodePage && !isReExecuted && context.Response.StatusCode == StatusCodes.Status404NotFound;
-        if (avoidStartingResponse)
-        {
-            // the request is going to be re-executed, we should avoid writing to the response
-            return;
-        }
-
         Task quiesceTask;
         if (!result.IsPost)
         {
diff --git a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs
index 6af020fc847a..8c60a17f00cf 100644
--- a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs
+++ b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Components.Endpoints.Rendering;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -77,21 +78,36 @@ private Task ReturnErrorResponse(string detailedMessage)
             : Task.CompletedTask;
     }
 
-    private async Task SetNotFoundResponseAsync(string baseUri)
+    private async Task SetNotFoundResponseAsync(string baseUri, NotFoundEventArgs args)
     {
         if (_httpContext.Response.HasStarted)
         {
+            if (args.NotFoundPageType == null || string.IsNullOrEmpty(args.Path))
+            {
+                throw new InvalidOperationException("The NotFoundPageType and Path must be specified in the NotFoundEventArgs to render NotFoundPage when the response has started.");
+            }
+            var instance = Activator.CreateInstance(args.NotFoundPageType) as IComponent;
+            if (instance == null)
+            {
+                throw new InvalidOperationException($"The type {args.NotFoundPageType.FullName} does not implement IComponent.");
+            }
+            if (_notFoundComponentId == -1)
+            {
+                _notFoundComponentId = AssignRootComponentId(instance);
+            }
+            if (string.IsNullOrEmpty(_notFoundUrl))
+            {
+                _notFoundUrl = $"{baseUri}{args.Path.TrimStart('/')}";
+            }
             var defaultBufferSize = 16 * 1024;
             await using var writer = new HttpResponseStreamWriter(_httpContext.Response.Body, Encoding.UTF8, defaultBufferSize, ArrayPool<byte>.Shared, ArrayPool<char>.Shared);
             using var bufferWriter = new BufferedTextWriter(writer);
-            var notFoundUri = $"{baseUri}not-found";
-            HandleNavigationAfterResponseStarted(bufferWriter, _httpContext, notFoundUri);
+            HandleNotFoundAfterResponseStarted(bufferWriter, _httpContext, _notFoundUrl, _notFoundComponentId);
             await bufferWriter.FlushAsync();
         }
         else
         {
             _httpContext.Response.StatusCode = StatusCodes.Status404NotFound;
-            _httpContext.Response.ContentType = null;
         }
 
         // When the application triggers a NotFound event, we continue rendering the current batch.
diff --git a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Streaming.cs b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Streaming.cs
index c17f7cd53555..f76b8c873f55 100644
--- a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Streaming.cs
+++ b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Streaming.cs
@@ -226,6 +226,15 @@ private static void HandleExceptionAfterResponseStarted(HttpContext httpContext,
         writer.Write("</template><blazor-ssr-end></blazor-ssr-end></blazor-ssr>");
     }
 
+    private static void HandleNotFoundAfterResponseStarted(TextWriter writer, HttpContext httpContext, string notFoundUrl, int componentId)
+    {
+        writer.Write("<blazor-ssr><template type=\"not-found\"");
+        writer.Write($" componentId=\"{componentId}\"");
+        writer.Write(">");
+        writer.Write(HtmlEncoder.Default.Encode(OpaqueRedirection.CreateProtectedRedirectionUrl(httpContext, notFoundUrl)));
+        writer.Write("</template><blazor-ssr-end></blazor-ssr-end></blazor-ssr>");
+    }
+
     private static void HandleNavigationAfterResponseStarted(TextWriter writer, HttpContext httpContext, string destinationUrl)
     {
         writer.Write("<blazor-ssr><template type=\"redirection\"");
diff --git a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs
index 33e52fa0ed57..e96b88971ad5 100644
--- a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs
+++ b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs
@@ -52,6 +52,9 @@ internal partial class EndpointHtmlRenderer : StaticHtmlRenderer, IComponentPrer
     // wait for the non-streaming tasks (these ones), then start streaming until full quiescence.
     private readonly List<Task> _nonStreamingPendingTasks = new();
 
+    private int _notFoundComponentId = -1;
+    private string _notFoundUrl = string.Empty;
+
     public EndpointHtmlRenderer(IServiceProvider serviceProvider, ILoggerFactory loggerFactory)
         : base(serviceProvider, loggerFactory)
     {
@@ -85,7 +88,7 @@ internal async Task InitializeStandardComponentServicesAsync(
 
         if (navigationManager != null)
         {
-            navigationManager.OnNotFound += async (sender, args) => await SetNotFoundResponseAsync(navigationManager.BaseUri);
+            navigationManager.OnNotFound += async (sender, args) => await SetNotFoundResponseAsync(navigationManager.BaseUri, args);
         }
 
         var authenticationStateProvider = httpContext.RequestServices.GetService<AuthenticationStateProvider>();
diff --git a/src/Components/Web.JS/src/Rendering/StreamingRendering.ts b/src/Components/Web.JS/src/Rendering/StreamingRendering.ts
index 06c650c2f99c..6e2b65373a54 100644
--- a/src/Components/Web.JS/src/Rendering/StreamingRendering.ts
+++ b/src/Components/Web.JS/src/Rendering/StreamingRendering.ts
@@ -8,6 +8,8 @@ import { synchronizeDomContent } from './DomMerging/DomSync';
 
 let enableDomPreservation = true;
 let navigationEnhancementCallbacks: NavigationEnhancementCallbacks;
+let currentNotFoundRenderAbortController: AbortController | null;
+const acceptHeader = 'text/html; blazor-enhanced-nav=on';
 
 export function attachStreamingRenderingListener(options: SsrStartOptions | undefined, callbacks: NavigationEnhancementCallbacks) {
   navigationEnhancementCallbacks = callbacks;
@@ -75,6 +77,34 @@ class BlazorStreamingUpdate extends HTMLElement {
                 }
               }
               break;
+            case 'not-found':
+              const componentId = node.getAttribute('componentId');
+              if (!componentId) {
+                console.error('Streaming content for not-found response does not have a componentId attribute.');
+                break;
+              }
+              wrapDocumentInStreamingMarkers(componentId);
+              const notFoundUrl = toAbsoluteUri(node.content.textContent!);
+
+              if (componentId) {
+                currentNotFoundRenderAbortController?.abort();
+                currentNotFoundRenderAbortController = new AbortController();
+                const abortSignal = currentNotFoundRenderAbortController.signal;
+                fetch(notFoundUrl, Object.assign(<RequestInit>{
+                  signal: abortSignal,
+                  mode: 'no-cors',
+                  headers: {
+                    'accept': acceptHeader,
+                  },
+                }, undefined))
+                  .then(response => response.text())
+                  .then(html => {
+                    const docFrag = document.createRange().createContextualFragment(html);
+                    insertStreamingContentIntoDocument(componentId, docFrag);
+                  })
+                  .catch(error => console.error('Failed to fetch not-found content:', error));
+              }
+              break;
             case 'error':
               // This is kind of brutal but matches what happens without progressive enhancement
               replaceDocumentWithPlainText(node.content.textContent || 'Error');
@@ -86,6 +116,22 @@ class BlazorStreamingUpdate extends HTMLElement {
   }
 }
 
+function wrapDocumentInStreamingMarkers(componentIdAsString: string): void {
+  // Add a comment before the <head>
+  const markerStart = document.createComment(`bl:${componentIdAsString}`);
+  const head = document.querySelector('head');
+  document.documentElement.insertBefore(markerStart, head);
+
+  // Add a comment after the <body> or after the <head> if <body> is null
+  const markerEnd = document.createComment(`/bl:${componentIdAsString}`);
+  const body = document.querySelector('body');
+  if (body && body.parentNode) {
+    body.parentNode.insertBefore(markerEnd, body.nextSibling);
+  } else if (head && head.parentNode) {
+    head.parentNode.insertBefore(markerEnd, head.nextSibling);
+  }
+}
+
 function insertStreamingContentIntoDocument(componentIdAsString: string, docFrag: DocumentFragment): void {
   const markers = findStreamingMarkers(componentIdAsString);
   if (markers) {
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
index 35f7140f9170..536eab21885a 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
@@ -80,13 +80,6 @@ public void NavigatesWithoutInteractivityByRequestRedirection(bool controlFlowBy
         Browser.Equal("Routing test cases", () => Browser.Exists(By.Id("test-info")).Text);
     }
 
-    [Fact]
-    public void CanRenderNotFoundPageAfterStreamingStarted()
-    {
-        Navigate($"{ServerPathBase}/streaming-set-not-found");
-        Browser.Equal("Default Not Found Page", () => Browser.Title);
-    }
-
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
@@ -127,36 +120,35 @@ private void Assert404ReExecuted() =>
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void CanRenderNotFoundPageNoStreaming(bool useCustomNotFoundPage)
+    public void CanRenderNotFoundPage(bool streamingStarted)
     {
-        string query = useCustomNotFoundPage ? "&useCustomNotFoundPage=true" : "";
-        Navigate($"{ServerPathBase}/set-not-found?shouldSet=true{query}");
-
-        if (useCustomNotFoundPage)
-        {
-            var infoText = Browser.FindElement(By.Id("test-info")).Text;
-            Assert.Contains("Welcome On Custom Not Found Page", infoText);
-            // custom page should have a custom layout
-            var aboutLink = Browser.FindElement(By.Id("about-link")).Text;
-            Assert.Contains("About", aboutLink);
-        }
-        else
-        {
-            var bodyText = Browser.FindElement(By.TagName("body")).Text;
-            Assert.Contains("There's nothing here", bodyText);
-        }
+        string streamingPath = streamingStarted ? "-streaming" : "";
+        Navigate($"{ServerPathBase}/set-not-found-ssr{streamingPath}?useCustomNotFoundPage=true");
+
+        var infoText = Browser.FindElement(By.Id("test-info")).Text;
+        Assert.Contains("Welcome On Custom Not Found Page", infoText);
+        // custom page should have a custom layout
+        var aboutLink = Browser.FindElement(By.Id("about-link")).Text;
+        Assert.Contains("About", aboutLink);
     }
 
     [Theory]
-    [InlineData(true)]
     [InlineData(false)]
-    public void CanRenderNotFoundPageWithStreaming(bool useCustomNotFoundPage)
+    [InlineData(true)]
+    public void DoesNotReExecuteIf404WasHandled(bool streamingStarted)
     {
-        // when streaming started, we always render page under "not-found" path
-        string query = useCustomNotFoundPage ? "?useCustomNotFoundPage=true" : "";
-        Navigate($"{ServerPathBase}/streaming-set-not-found{query}");
+        string streamingPath = streamingStarted ? "-streaming" : "";
+        Navigate($"{ServerPathBase}/reexecution/set-not-found-ssr{streamingPath}");
+        AssertNotFoundFragmentRendered();
+    }
+
+    private void AssertNotFoundFragmentRendered() =>
+        Browser.Equal("There's nothing here", () => Browser.FindElement(By.Id("not-found-fragment")).Text);
 
-        string expectedTitle = "Default Not Found Page";
-        Browser.Equal(expectedTitle, () => Browser.Title);
+    [Fact]
+    public void StatusCodePagesWithReExecution()
+    {
+        Navigate($"{ServerPathBase}/reexecution/trigger-404");
+        Browser.Equal("Re-executed page", () => Browser.Title);
     }
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/StatusCodePagesTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/StatusCodePagesTest.cs
deleted file mode 100644
index 58ac90b39bbe..000000000000
--- a/src/Components/test/E2ETest/ServerRenderingTests/StatusCodePagesTest.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Components.TestServer.RazorComponents;
-using Components.TestServer.RazorComponents.Pages.StreamingRendering;
-using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
-using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
-using Microsoft.AspNetCore.E2ETesting;
-using OpenQA.Selenium;
-using TestServer;
-using Xunit.Abstractions;
-
-namespace Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
-
-public class StatusCodePagesTest(BrowserFixture browserFixture, BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<App>> serverFixture, ITestOutputHelper output)
-    : ServerTestBase<BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<App>>>(browserFixture, serverFixture, output)
-{
-
-    [Theory]
-    [InlineData(false, false)]
-    [InlineData(true, false)]
-    [InlineData(true, true)]
-    public void StatusCodePagesWithReExecution(bool streaming, bool responseStarted)
-    {
-        string streamingPath = streaming ? "streaming-" : "";
-        Navigate($"{ServerPathBase}/reexecution/{streamingPath}set-not-found?responseStarted={responseStarted}");
-
-        // streaming when response started does not re-execute
-        string expectedTitle = responseStarted
-            ? "Default Not Found Page"
-            : "Re-executed page";
-        Browser.Equal(expectedTitle, () => Browser.Title);
-    }
-}
diff --git a/src/Components/test/E2ETest/Tests/GlobalInteractivityTest.cs b/src/Components/test/E2ETest/Tests/GlobalInteractivityTest.cs
index 0595baa95bc0..368cfab8251c 100644
--- a/src/Components/test/E2ETest/Tests/GlobalInteractivityTest.cs
+++ b/src/Components/test/E2ETest/Tests/GlobalInteractivityTest.cs
@@ -37,11 +37,7 @@ public void CanRenderNotFoundInteractive(string renderingMode, bool useCustomNot
 
         if (useCustomNotFoundPage)
         {
-            var infoText = Browser.FindElement(By.Id("test-info")).Text;
-            Assert.Contains("Welcome On Custom Not Found Page", infoText);
-            // custom page should have a custom layout
-            var aboutLink = Browser.FindElement(By.Id("about-link")).Text;
-            Assert.Contains("About", aboutLink);
+            AssertCustomNotFoundPageRendered();
         }
         else
         {
@@ -140,4 +136,67 @@ public void CanNavigateBetweenStaticPagesViaEnhancedNav()
         Browser.Equal("Global interactivity page: Static via attribute", () => h1.Text);
         Browser.Equal("static", () => Browser.Exists(By.Id("execution-mode")).Text);
     }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void CanRenderNotFoundPage_SSR(bool streamingStarted)
+    {
+        string streamingPath = streamingStarted ? "-streaming" : "";
+        Navigate($"{ServerPathBase}/set-not-found-ssr{streamingPath}?useCustomNotFoundPage=true");
+        AssertCustomNotFoundPageRendered();
+    }
+
+    [Theory]
+    [InlineData("ServerNonPrerendered")]
+    [InlineData("WebAssemblyNonPrerendered")]
+    public void CanRenderNotFoundPage_Interactive(string renderMode)
+    {
+        Navigate($"{ServerPathBase}/set-not-found?useCustomNotFoundPage=true&renderMode={renderMode}");
+        AssertCustomNotFoundPageRendered();
+    }
+
+    private void AssertCustomNotFoundPageRendered()
+    {
+        var infoText = Browser.FindElement(By.Id("test-info")).Text;
+        Assert.Contains("Welcome On Custom Not Found Page", infoText);
+        // custom page should have a custom layout
+        var aboutLink = Browser.FindElement(By.Id("about-link")).Text;
+        Assert.Contains("About", aboutLink);
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public void DoesNotReExecuteIf404WasHandled_SSR(bool streamingStarted)
+    {
+        string streamingPath = streamingStarted ? "-streaming" : "";
+        Navigate($"{ServerPathBase}/reexecution/set-not-found-ssr{streamingPath}");
+        AssertNotFoundFragmentRendered();
+    }
+
+    [Theory]
+    [InlineData("ServerNonPrerendered")]
+    [InlineData("WebAssemblyNonPrerendered")]
+    public void DoesNotReExecuteIf404WasHandled_Interactive(string renderMode)
+    {
+        Navigate($"{ServerPathBase}/reexecution/set-not-found?renderMode={renderMode}");
+        AssertNotFoundFragmentRendered();
+    }
+
+    private void AssertNotFoundFragmentRendered()
+    {
+        var body = Browser.FindElement(By.TagName("body"));
+        var notFound = Browser.FindElement(By.Id("not-found-fragment")).Text;
+        Browser.Equal("There's nothing here", () => Browser.FindElement(By.Id("not-found-fragment")).Text);
+    }
+
+    [Fact]
+    public void StatusCodePagesWithReExecution()
+    {
+        Navigate($"{ServerPathBase}/reexecution/trigger-404");
+        Assert404ReExecuted();
+    }
+    private void Assert404ReExecuted() =>
+        Browser.Equal("Welcome On Page Re-executed After Not Found Event", () => Browser.Exists(By.Id("test-info")).Text);
 }
diff --git a/src/Components/test/testassets/Components.Shared/ComponentThatSetsNotFound.razor b/src/Components/test/testassets/Components.Shared/ComponentThatSetsNotFound.razor
new file mode 100644
index 000000000000..fe024d3bb8d0
--- /dev/null
+++ b/src/Components/test/testassets/Components.Shared/ComponentThatSetsNotFound.razor
@@ -0,0 +1,26 @@
+@inject NavigationManager NavigationManager
+
+@if (!WaitForInteractivity || RendererInfo.IsInteractive)
+{
+    <PageTitle>Original page</PageTitle>
+
+    <p id="test-info">Any content</p>
+
+}
+
+@code{
+    [Parameter]
+    public bool StartStreaming { get; set; } = false;
+
+    [Parameter]
+    public bool WaitForInteractivity { get; set; } = false;
+
+    protected async override Task OnInitializedAsync()
+    {
+        if (StartStreaming)
+        {
+            await Task.Yield();
+        }
+        NavigationManager.NotFound();
+    }
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/Components.Shared/Components.Shared.csproj b/src/Components/test/testassets/Components.Shared/Components.Shared.csproj
new file mode 100644
index 000000000000..e2b71dba2459
--- /dev/null
+++ b/src/Components/test/testassets/Components.Shared/Components.Shared.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Components.Web" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/NotFoundPage.razor b/src/Components/test/testassets/Components.Shared/NotFoundPage.razor
similarity index 100%
rename from src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/NotFoundPage.razor
rename to src/Components/test/testassets/Components.Shared/NotFoundPage.razor
diff --git a/src/Components/test/testassets/Components.Shared/PageThatSetsNotFound-no-streaming.razor b/src/Components/test/testassets/Components.Shared/PageThatSetsNotFound-no-streaming.razor
new file mode 100644
index 000000000000..6ac4db557e13
--- /dev/null
+++ b/src/Components/test/testassets/Components.Shared/PageThatSetsNotFound-no-streaming.razor
@@ -0,0 +1,11 @@
+@page "/reexecution/set-not-found-ssr"
+@page "/set-not-found-ssr"
+@attribute [StreamRendering(false)]
+
+@*
+    this page is used in global interactivity and no interactivity scenarios
+    the content is rendered on the server without streaming and might become
+    interactive later if interactivity was enabled in the app
+*@
+
+<Components.Shared.ComponentThatSetsNotFound />
\ No newline at end of file
diff --git a/src/Components/test/testassets/Components.Shared/PageThatSetsNotFound-streaming.razor b/src/Components/test/testassets/Components.Shared/PageThatSetsNotFound-streaming.razor
new file mode 100644
index 000000000000..061d35386bc0
--- /dev/null
+++ b/src/Components/test/testassets/Components.Shared/PageThatSetsNotFound-streaming.razor
@@ -0,0 +1,11 @@
+@page "/reexecution/set-not-found-ssr-streaming"
+@page "/set-not-found-ssr-streaming"
+@attribute [StreamRendering(true)]
+
+@*
+    this page is used in global interactivity and no interactivity scenarios
+    the content is rendered on the server with streaming and might become
+    interactive later if interactivity was enabled in the app
+*@
+
+<Components.Shared.ComponentThatSetsNotFound StartStreaming="true"/>
\ No newline at end of file
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/ReexecutedPage.razor b/src/Components/test/testassets/Components.Shared/ReexecutedPage.razor
similarity index 100%
rename from src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/ReexecutedPage.razor
rename to src/Components/test/testassets/Components.Shared/ReexecutedPage.razor
diff --git a/src/Components/test/testassets/Components.Shared/_Imports.razor b/src/Components/test/testassets/Components.Shared/_Imports.razor
new file mode 100644
index 000000000000..2b9557ce5a53
--- /dev/null
+++ b/src/Components/test/testassets/Components.Shared/_Imports.razor
@@ -0,0 +1 @@
+@using Microsoft.AspNetCore.Components.Web
\ No newline at end of file
diff --git a/src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj b/src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj
index b7d6d2b019b8..7f14796efe56 100644
--- a/src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj
+++ b/src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj
@@ -36,6 +36,7 @@
     <ProjectReference Include="..\BasicTestApp\BasicTestApp.csproj" />
     <ProjectReference Include="..\Components.WasmMinimal\Components.WasmMinimal.csproj" />
     <ProjectReference Include="..\Components.WasmRemoteAuthentication\Components.WasmRemoteAuthentication.csproj" />
+    <ProjectReference Include="..\Components.Shared\Components.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsNoInteractivityStartup.cs b/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsNoInteractivityStartup.cs
index 4520d9202397..6bc67a18c6fc 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsNoInteractivityStartup.cs
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsNoInteractivityStartup.cs
@@ -50,6 +50,15 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             app.Map("/reexecution", reexecutionApp =>
             {
+                app.Map("/trigger-404", trigger404App =>
+                {
+                    trigger404App.Run(async context =>
+                    {
+                        context.Response.StatusCode = 404;
+                        await context.Response.WriteAsync("Triggered a 404 status code.");
+                    });
+                });
+
                 if (!env.IsDevelopment())
                 {
                     app.UseExceptionHandler("/Error", createScopeForErrors: true);
@@ -62,7 +71,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 reexecutionApp.UseAntiforgery();
                 reexecutionApp.UseEndpoints(endpoints =>
                 {
-                    endpoints.MapRazorComponents<TRootComponent>();
+                    endpoints.MapRazorComponents<TRootComponent>()
+                        .AddAdditionalAssemblies(Assembly.Load("Components.Shared"));
                 });
             });
 
@@ -83,7 +93,8 @@ private void ConfigureSubdirPipeline(IApplicationBuilder app, IWebHostEnvironmen
         app.UseAntiforgery();
         app.UseEndpoints(endpoints =>
         {
-            endpoints.MapRazorComponents<TRootComponent>();
+            endpoints.MapRazorComponents<TRootComponent>()
+                .AddAdditionalAssemblies(Assembly.Load("Components.Shared"));
         });
     }
 }
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsStartup.cs b/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsStartup.cs
index 4bb4bee5014c..2eccc4f661fb 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsStartup.cs
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsStartup.cs
@@ -88,6 +88,14 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             app.Map("/reexecution", reexecutionApp =>
             {
+                app.Map("/trigger-404", app =>
+                {
+                    app.Run(async context =>
+                    {
+                        context.Response.StatusCode = 404;
+                        await context.Response.WriteAsync("Triggered a 404 status code.");
+                    });
+                });
                 reexecutionApp.UseStatusCodePagesWithReExecute("/not-found-reexecute", createScopeForErrors: true);
                 reexecutionApp.UseRouting();
 
@@ -138,6 +146,7 @@ private void ConfigureEndpoints(IApplicationBuilder app, IWebHostEnvironment env
             }
 
             _ = endpoints.MapRazorComponents<TRootComponent>()
+                .AddAdditionalAssemblies(Assembly.Load("Components.Shared"))
                 .AddAdditionalAssemblies(Assembly.Load("Components.WasmMinimal"))
                 .AddInteractiveServerRenderMode(options =>
                 {
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
index ace8d627d941..9912b1055e79 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
@@ -29,12 +29,12 @@
     <HeadOutlet />
 </head>
 <body>
-    <Router AppAssembly="@typeof(App).Assembly" NotFoundPage="NotFoundPageType">
+    <Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="new[] { typeof(Components.Shared.NotFoundPage).Assembly }" NotFoundPage="NotFoundPageType">
         <Found Context="routeData">
             <RouteView RouteData="@routeData" />
             <FocusOnNavigate RouteData="@routeData" Selector="[data-focus-on-navigate]" />
         </Found>
-        <NotFound>There's nothing here</NotFound>
+        <NotFound><p id="not-found-fragment">There's nothing here</p></NotFound>
     </Router>
     <script>
         // This script must come before blazor.web.js to test that
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/PageThatSetsNotFound.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/PageThatSetsNotFound.razor
deleted file mode 100644
index e397f81672a3..000000000000
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/PageThatSetsNotFound.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/reexecution/set-not-found"
-@page "/set-not-found"
-@attribute [StreamRendering(false)]
-@inject NavigationManager NavigationManager
-
-<PageTitle>Original page</PageTitle>
-
-<p id="test-info">Any content</p>
-
-@code{
-    [Parameter]
-    [SupplyParameterFromQuery(Name = "shouldSet")]
-    public bool? ShouldSet { get; set; }
-
-    protected override void OnInitialized()
-    {
-        bool shouldSet = ShouldSet ?? true;
-        if (shouldSet)
-        {
-            NavigationManager.NotFound();
-        }
-    }
-}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/LargeStreamRendering.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/LargeStreamRendering.razor
index 9b6d199c76ee..99ea274e45d2 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/LargeStreamRendering.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/LargeStreamRendering.razor
@@ -2,6 +2,8 @@
 
 @attribute [StreamRendering]
 
+<PageTitle>Streaming</PageTitle>
+
 <h1>Streaming Rendering</h1>
 
 <NotEnabledStreamingRenderingComponent UseLargeItems="true"/>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingRendering.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingRendering.razor
index 0bd36fd4817c..64f85052ae2d 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingRendering.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingRendering.razor
@@ -2,6 +2,8 @@
 
 @attribute [StreamRendering]
 
+<PageTitle>Streaming</PageTitle>
+
 <h1>Streaming Rendering</h1>
 
 <NotEnabledStreamingRenderingComponent />
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingSetNotFound.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingSetNotFound.razor
deleted file mode 100644
index 92b5f95d7c4b..000000000000
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingSetNotFound.razor
+++ /dev/null
@@ -1,30 +0,0 @@
-@page "/reexecution/streaming-set-not-found"
-@page "/streaming-set-not-found"
-@attribute [StreamRendering]
-@inject NavigationManager NavigationManager
-
-@code {
-    [Parameter]
-    [SupplyParameterFromQuery(Name = "shouldSet")]
-    public bool? ShouldSet { get; set; }
-
-    [Parameter]
-    [SupplyParameterFromQuery(Name = "responseStarted")]
-    public bool? ResponseStarted { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        bool shouldSet = ShouldSet ?? true;
-        bool responseStarted = ResponseStarted ?? true;
-        if (responseStarted)
-        {
-            // Simulate some delay before triggering NotFound to start streaming response
-            await Task.Yield();
-        }
-
-        if (shouldSet)
-        {
-            NavigationManager.NotFound();
-        }
-    }
-}
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj b/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj
index deabcd7fccae..ecacf8c5078d 100644
--- a/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj
+++ b/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj
@@ -16,6 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\NotReferencedInWasmCodePackage\NotReferencedInWasmCodePackage.csproj" />
     <ProjectReference Include="..\TestContentPackage\TestContentPackage.csproj" />
+    <ProjectReference Include="..\Components.Shared\Components.Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/PageThatSetsNotFound-Interactive.razor b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/PageThatSetsNotFound-Interactive.razor
new file mode 100644
index 000000000000..46c0c65cecf9
--- /dev/null
+++ b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/PageThatSetsNotFound-Interactive.razor
@@ -0,0 +1,28 @@
+@page "/reexecution/set-not-found"
+@page "/set-not-found"
+
+@*
+    this page is used only in global interactivity scenarios
+    the component's content will be rendered when it becomes interactive
+*@
+
+<Components.Shared.ComponentThatSetsNotFound @rendermode="@RenderModeHelper.GetRenderMode(_renderMode)" WaitForInteractivity="true" />
+
+@code{
+    [Parameter, SupplyParameterFromQuery(Name = "renderMode")]
+    public string? RenderModeStr { get; set; }
+
+    private RenderModeId _renderMode;
+
+    protected override void OnInitialized()
+    {
+        if (!string.IsNullOrEmpty(RenderModeStr))
+        {
+            _renderMode = RenderModeHelper.ParseRenderMode(RenderModeStr);
+        }
+        else
+        {
+            throw new ArgumentException("RenderModeStr cannot be null or empty. Did you mean to redirect to /set-not-found-ssr?", nameof(RenderModeStr));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Routes.razor b/src/Components/test/testassets/Components.WasmMinimal/Routes.razor
index 92f41cc8b4f1..18226373e31c 100644
--- a/src/Components/test/testassets/Components.WasmMinimal/Routes.razor
+++ b/src/Components/test/testassets/Components.WasmMinimal/Routes.razor
@@ -22,10 +22,10 @@
     }
 }
 
-<Router AppAssembly="@typeof(Program).Assembly" NotFoundPage="NotFoundPageType">
+<Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(Components.Shared.NotFoundPage).Assembly }" NotFoundPage="NotFoundPageType">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" />
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />
     </Found>
-    <NotFound>There's nothing here</NotFound>
+    <NotFound><p id="not-found-fragment">There's nothing here</p></NotFound>
 </Router>
diff --git a/src/Mvc/test/Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs
index d319827f9a33..11ed2cd95595 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs
@@ -89,7 +89,7 @@ public async Task Renders_RoutingComponent_UsingRazorComponents_Prerenderer()
         await response.AssertStatusCodeAsync(HttpStatusCode.OK);
         var content = await response.Content.ReadAsStringAsync();
 
-        AssertComponent("Router component\n<p>Routed successfully</p>", "Routing", content);
+        AssertComponent("Router component\n<!--bl:3--><!--bl:4--><!--bl:5--><!--bl:6--><p>Routed successfully</p><!--/bl:6--><!--/bl:5--><!--/bl:4--><!--/bl:3-->", "Routing", content);
     }
 
     [Fact]