diff --git a/src/Mvc/Mvc.Razor/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.Razor/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..5b615e3dde8c 100644
--- a/src/Mvc/Mvc.Razor/src/PublicAPI.Unshipped.txt
+++ b/src/Mvc/Mvc.Razor/src/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+*REMOVED*Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>.Model.get -> TModel?
+Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>.Model.get -> TModel
diff --git a/src/Mvc/Mvc.Razor/src/RazorPageOfT.cs b/src/Mvc/Mvc.Razor/src/RazorPageOfT.cs
index 1a11b9945bcc..a80b4c769a0a 100644
--- a/src/Mvc/Mvc.Razor/src/RazorPageOfT.cs
+++ b/src/Mvc/Mvc.Razor/src/RazorPageOfT.cs
@@ -15,12 +15,11 @@ public abstract class RazorPage<TModel> : RazorPage
     /// <summary>
     /// Gets the Model property of the <see cref="ViewData"/> property.
     /// </summary>
-    public TModel? Model => ViewData == null ? default(TModel) : ViewData.Model;
+    public TModel Model => ViewData.Model;
 
     /// <summary>
     /// Gets or sets the dictionary for view data.
     /// </summary>
     [RazorInject]
     public ViewDataDictionary<TModel> ViewData { get; set; } = default!;
-
 }
diff --git a/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..73d4cbd64fd1 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Unshipped.txt
+++ b/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+*REMOVED*Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TModel>.Model.get -> TModel?
+Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TModel>.Model.get -> TModel
diff --git a/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryOfT.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryOfT.cs
index 99d1a423996a..b6eaff1a9d2c 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryOfT.cs
+++ b/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryOfT.cs
@@ -86,15 +86,9 @@ internal ViewDataDictionary(IModelMetadataProvider metadataProvider)
     }
 
     /// <inheritdoc />
-    public new TModel? Model
+    public new TModel Model
     {
-        get
-        {
-            return (base.Model == null) ? default(TModel) : (TModel)base.Model;
-        }
-        set
-        {
-            base.Model = value;
-        }
+        get => (base.Model is null) ? default! : (TModel)base.Model;
+        set => base.Model = value;
     }
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/Error.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/Error.cshtml
index 10cf32b713d0..a1e04783c67a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/Error.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/Error.cshtml
@@ -6,10 +6,10 @@
 <h1 class="text-danger">Error.</h1>
 <h2 class="text-danger">An error occurred while processing your request.</h2>
 
-@if (Model?.ShowRequestId ?? false)
+@if (Model.ShowRequestId)
 {
     <p>
-        <strong>Request ID:</strong> <code>@Model?.RequestId</code>
+        <strong>Request ID:</strong> <code>@Model.RequestId</code>
     </p>
 }