diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
index 8769138a008..20d023d87d6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
@@ -249,6 +249,77 @@ @model SomeType
         Assert.Equal($"TModel = global::System.Object", usingNode.Content);
     }
 
+    [Fact]
+    public void ModelDirective_Uses_IncompleteGenericType()
+    {
+        // Arrange
+        var codeDocument = CreateDocument(@"
+@model Type1<
+");
+        var engine = CreateRuntimeEngine();
+        var irDocument = CreateIRDocument(engine, codeDocument);
+
+        // Act
+        var result = ModelDirective.GetModelType(irDocument);
+
+        // Assert
+        Assert.Equal("""
+                     Type1<
+ 
+                     """, result);
+    }
+
+    [Fact]
+    public void ModelDirective_Uses_IncompleteGenericType2()
+    {
+        // Arrange
+        var codeDocument = CreateDocument(@"
+@model Type1<object
+");
+        var engine = CreateRuntimeEngine();
+        var irDocument = CreateIRDocument(engine, codeDocument);
+        
+        // Act
+        var result = ModelDirective.GetModelType(irDocument);
+
+        // Assert
+        Assert.Equal("""
+                     Type1<object
+
+                     """, result);
+    }
+
+    [Fact]
+    public void ModelDirectivePass_Execute_ReplacesTModelInBaseType_WithComment()
+    {
+        // Arrange
+        var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+@model /*comment*/ Type1
+");
+
+        var engine = CreateRuntimeEngine();
+        var pass = new ModelDirective.Pass()
+        {
+            Engine = engine,
+        };
+
+        var irDocument = CreateIRDocument(engine, codeDocument);
+
+        // Act
+        pass.Execute(codeDocument, irDocument);
+
+        // Assert
+        var @class = FindClassNode(irDocument);
+        var baseType = @class.BaseType;
+
+        Assert.Equal("BaseType", baseType.BaseType.Content);
+        Assert.NotNull(baseType.BaseType.Source);
+
+        Assert.Equal("Type1", baseType.ModelType.Content);
+        Assert.NotNull(baseType.ModelType.Source);
+    }
+
     private RazorCodeDocument CreateDocument(string content)
     {
         var source = RazorSourceDocument.Create(content, "test.cshtml");
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index b64479e99a5..f635af541f8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -5649,6 +5649,79 @@ @inherits BaseComponent
         CompileToAssembly(generated);
     }
 
+    [IntegrationTestFact, WorkItem("https://github.com/dotnet/razor/issues/10963")]
+    public void InheritsDirective_IncompleteType()
+    {
+        // Arrange
+        AdditionalSyntaxTrees.Add(Parse("""
+            namespace Test;
+
+            public abstract class BaseComponent<T> : Microsoft.AspNetCore.Components.ComponentBase
+            {
+            }
+            """));
+
+        // Act
+        var generated = CompileToCSharp("""
+            @inherits 
+            """,
+            // (22,33): error CS0115: 'TestComponent.BuildRenderTree(RenderTreeBuilder)': no suitable method found to override
+            //         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+            Diagnostic(ErrorCode.ERR_OverrideNotExpected, "BuildRenderTree").WithArguments("Test.TestComponent.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder)").WithLocation(22, 33)
+            );
+
+        // Assert
+        AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+
+        AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+        CompileToAssembly(generated,
+            DesignTime
+            ? []
+            : [
+                // (18,33): error CS0115: 'TestComponent.BuildRenderTree(RenderTreeBuilder)': no suitable method found to override
+                //         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+                Diagnostic(ErrorCode.ERR_OverrideNotExpected, "BuildRenderTree").WithArguments("Test.TestComponent.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder)").WithLocation(18, 33)
+              ]
+            );
+    }
+
+    [IntegrationTestFact, WorkItem("https://github.com/dotnet/razor/issues/10963")]
+    public void InheritsDirective_IncompleteGenericType()
+    {
+        // Arrange
+        AdditionalSyntaxTrees.Add(Parse("""
+            namespace Test;
+
+            public abstract class BaseComponent<T> : Microsoft.AspNetCore.Components.ComponentBase
+            {
+            }
+            """));
+
+        // Act
+        var generated = CompileToCSharp("""
+            @inherits BaseComponent<object
+            """,
+            // x:\dir\subdir\Test\TestComponent.cshtml(1,31): error CS1003: Syntax error, '>' expected
+            // BaseComponent<object
+            Diagnostic(ErrorCode.ERR_SyntaxError, "").WithArguments(">").WithLocation(1, 31)
+            );
+
+        // Assert
+        AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+
+        AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+        CompileToAssembly(generated,
+            DesignTime?[
+                // x:\dir\subdir\Test\TestComponent.cshtml(1,22): error CS1003: Syntax error, '>' expected
+                // BaseComponent<object __typeHelper = default!;
+                Diagnostic(ErrorCode.ERR_SyntaxError, "__typeHelper").WithArguments(">").WithLocation(1, 22)
+                ] : [
+                // x:\dir\subdir\Test\TestComponent.cshtml(1,31): error CS1003: Syntax error, '>' expected
+                // BaseComponent<object
+                Diagnostic(ErrorCode.ERR_SyntaxError, "").WithArguments(">").WithLocation(1, 31)
+                ]);
+    }
+
     [IntegrationTestFact, WorkItem("https://github.com/dotnet/razor/issues/7169")]
     public void InheritsDirective_NullableReferenceType()
     {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
index c9c21931222..780b0074b74 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
@@ -18,7 +18,7 @@ namespace AspNetCoreGeneratedDocument
     [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml")]
     [global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute]
     #nullable restore
-    internal sealed class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    internal sealed class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives
     #nullable disable
     {
         #pragma warning disable 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.cs-diagnostics.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.cs-diagnostics.txt
new file mode 100644
index 00000000000..0338e65f2e4
--- /dev/null
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.cs-diagnostics.txt
@@ -0,0 +1,30 @@
+// TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(25,67): error CS0115: 'TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives.ExecuteAsync()': no suitable method found to override
+//         public async override global::System.Threading.Tasks.Task ExecuteAsync()
+Diagnostic(ErrorCode.ERR_OverrideNotExpected, "ExecuteAsync").WithArguments("AspNetCoreGeneratedDocument.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives.ExecuteAsync()").WithLocation(25, 67),
+// TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(27,13): error CS0103: The name 'WriteLiteral' does not exist in the current context
+//             WriteLiteral("\r\n");
+Diagnostic(ErrorCode.ERR_NameNotInContext, "WriteLiteral").WithArguments("WriteLiteral").WithLocation(27, 13),
+// TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(28,13): error CS0103: The name 'WriteLiteral' does not exist in the current context
+//             WriteLiteral("\r\n");
+Diagnostic(ErrorCode.ERR_NameNotInContext, "WriteLiteral").WithArguments("WriteLiteral").WithLocation(28, 13),
+// TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(29,13): error CS0103: The name 'WriteLiteral' does not exist in the current context
+//             WriteLiteral("\r\n");
+Diagnostic(ErrorCode.ERR_NameNotInContext, "WriteLiteral").WithArguments("WriteLiteral").WithLocation(29, 13),
+// TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(30,13): error CS0103: The name 'WriteLiteral' does not exist in the current context
+//             WriteLiteral("\r\n");
+Diagnostic(ErrorCode.ERR_NameNotInContext, "WriteLiteral").WithArguments("WriteLiteral").WithLocation(30, 13),
+// TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(31,13): error CS0103: The name 'WriteLiteral' does not exist in the current context
+//             WriteLiteral("\r\n");
+Diagnostic(ErrorCode.ERR_NameNotInContext, "WriteLiteral").WithArguments("WriteLiteral").WithLocation(31, 13),
+// TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(32,13): error CS0103: The name 'WriteLiteral' does not exist in the current context
+//             WriteLiteral("\r\n\r\n");
+Diagnostic(ErrorCode.ERR_NameNotInContext, "WriteLiteral").WithArguments("WriteLiteral").WithLocation(32, 13),
+// TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(33,13): error CS0103: The name 'WriteLiteral' does not exist in the current context
+//             WriteLiteral("\r\n");
+Diagnostic(ErrorCode.ERR_NameNotInContext, "WriteLiteral").WithArguments("WriteLiteral").WithLocation(33, 13),
+// TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(34,13): error CS0103: The name 'WriteLiteral' does not exist in the current context
+//             WriteLiteral("\r\n\r\n");
+Diagnostic(ErrorCode.ERR_NameNotInContext, "WriteLiteral").WithArguments("WriteLiteral").WithLocation(34, 13),
+// TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(35,13): error CS0103: The name 'WriteLiteral' does not exist in the current context
+//             WriteLiteral("{\r\n");
+Diagnostic(ErrorCode.ERR_NameNotInContext, "WriteLiteral").WithArguments("WriteLiteral").WithLocation(35, 13)
\ No newline at end of file
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
index 7274c0398a5..1e07ddafaa0 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -11,7 +11,7 @@
         RazorSourceChecksumAttribute - 
         RazorCompiledItemMetadataAttribute - 
         CreateNewOnMetadataUpdateAttribute - 
-        ClassDeclaration -  - internal sealed - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+        ClassDeclaration -  - internal sealed - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives -  - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
                     LazyIntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteGenericType/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteGenericType/TestComponent.codegen.cs
new file mode 100644
index 00000000000..b9ef5a543c4
--- /dev/null
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteGenericType/TestComponent.codegen.cs
@@ -0,0 +1,32 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line default
+    using global::System;
+    using global::System.Collections.Generic;
+    using global::System.Linq;
+    using global::System.Threading.Tasks;
+    using global::Microsoft.AspNetCore.Components;
+    #line default
+    #line hidden
+    #nullable restore
+    public partial class TestComponent : 
+#nullable restore
+#line (1,11)-(1,31) "x:\dir\subdir\Test\TestComponent.cshtml"
+BaseComponent<object
+
+#line default
+#line hidden
+#nullable disable
+
+    #nullable disable
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteGenericType/TestComponent.ir.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteGenericType/TestComponent.ir.txt
new file mode 100644
index 00000000000..5717df2eb3f
--- /dev/null
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteGenericType/TestComponent.ir.txt
@@ -0,0 +1,11 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [20] ) - global::System
+        UsingDirective - (26:2,1 [40] ) - global::System.Collections.Generic
+        UsingDirective - (69:3,1 [25] ) - global::System.Linq
+        UsingDirective - (97:4,1 [36] ) - global::System.Threading.Tasks
+        UsingDirective - (136:5,1 [45] ) - global::Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - BaseComponent<object - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MalformedDirective - (0:0,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - inherits
+                    DirectiveToken - (10:0,10 [20] x:\dir\subdir\Test\TestComponent.cshtml) - BaseComponent<object
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteGenericType/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteGenericType/TestComponent.mappings.txt
new file mode 100644
index 00000000000..3205c5150b8
--- /dev/null
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteGenericType/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (10:0,10 [20] x:\dir\subdir\Test\TestComponent.cshtml)
+|BaseComponent<object|
+Generated Location: (476:16,0 [20] )
+|BaseComponent<object|
+
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteType/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteType/TestComponent.codegen.cs
new file mode 100644
index 00000000000..a24297bb93e
--- /dev/null
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteType/TestComponent.codegen.cs
@@ -0,0 +1,24 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line default
+    using global::System;
+    using global::System.Collections.Generic;
+    using global::System.Linq;
+    using global::System.Threading.Tasks;
+    using global::Microsoft.AspNetCore.Components;
+    #line default
+    #line hidden
+    #nullable restore
+    public partial class TestComponent
+    #nullable disable
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteType/TestComponent.ir.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteType/TestComponent.ir.txt
new file mode 100644
index 00000000000..288ef01f445
--- /dev/null
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InheritsDirective_IncompleteType/TestComponent.ir.txt
@@ -0,0 +1,11 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [20] ) - global::System
+        UsingDirective - (26:2,1 [40] ) - global::System.Collections.Generic
+        UsingDirective - (69:3,1 [25] ) - global::System.Linq
+        UsingDirective - (97:4,1 [36] ) - global::System.Threading.Tasks
+        UsingDirective - (136:5,1 [45] ) - global::Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent -  - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MalformedDirective - (0:0,0 [10] x:\dir\subdir\Test\TestComponent.cshtml) - inherits
+                    DirectiveToken - (10:0,10 [0] x:\dir\subdir\Test\TestComponent.cshtml) - 
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Extensions/InheritsDirectivePass.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Extensions/InheritsDirectivePass.cs
index d338750f0c4..4a6a413537d 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Extensions/InheritsDirectivePass.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Extensions/InheritsDirectivePass.cs
@@ -19,9 +19,9 @@ protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentInte
             return;
         }
 
-        foreach (var inherits in documentNode.FindDirectiveReferences(InheritsDirective.Directive))
+        foreach (var inherits in documentNode.FindDirectiveReferences(InheritsDirective.Directive, includeMalformed: codeDocument.GetParserOptions()?.DesignTime != true))
         {
-            var token = ((DirectiveIntermediateNode)inherits.Node).Tokens.FirstOrDefault();
+            var token = inherits.Node.Children.OfType<DirectiveTokenIntermediateNode>().FirstOrDefault();
             if (token != null)
             {
                 var source = codeDocument.GetParserOptions()?.DesignTime == true ? null : token.Source;
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/DocumentIntermediateNodeExtensions.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/DocumentIntermediateNodeExtensions.cs
index dbb58707e37..49e8eaff6cd 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/DocumentIntermediateNodeExtensions.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/DocumentIntermediateNodeExtensions.cs
@@ -40,7 +40,7 @@ public static NamespaceDeclarationIntermediateNode FindPrimaryNamespace(this Doc
         return FindWithAnnotation<NamespaceDeclarationIntermediateNode>(node, CommonAnnotations.PrimaryNamespace);
     }
 
-    public static IReadOnlyList<IntermediateNodeReference> FindDirectiveReferences(this DocumentIntermediateNode node, DirectiveDescriptor directive)
+    public static IReadOnlyList<IntermediateNodeReference> FindDirectiveReferences(this DocumentIntermediateNode node, DirectiveDescriptor directive, bool includeMalformed = false)
     {
         if (node == null)
         {
@@ -52,7 +52,7 @@ public static IReadOnlyList<IntermediateNodeReference> FindDirectiveReferences(t
             throw new ArgumentNullException(nameof(directive));
         }
 
-        var visitor = new DirectiveVisitor(directive);
+        var visitor = new DirectiveVisitor(directive, includeMalformed);
         visitor.Visit(node);
         return visitor.Directives;
     }
@@ -92,10 +92,12 @@ private static T FindWithAnnotation<T>(IntermediateNode node, object annotation)
     private class DirectiveVisitor : IntermediateNodeWalker
     {
         private readonly DirectiveDescriptor _directive;
+        private readonly bool _includeMalformed;
 
-        public DirectiveVisitor(DirectiveDescriptor directive)
+        public DirectiveVisitor(DirectiveDescriptor directive, bool includeMalformed)
         {
             _directive = directive;
+            _includeMalformed = includeMalformed;
         }
 
         public List<IntermediateNodeReference> Directives = new List<IntermediateNodeReference>();
@@ -109,6 +111,15 @@ public override void VisitDirective(DirectiveIntermediateNode node)
 
             base.VisitDirective(node);
         }
+
+        public override void VisitMalformedDirective(MalformedDirectiveIntermediateNode node)
+        {
+            if (_includeMalformed && _directive == node.Directive)
+            {
+                Directives.Add(new IntermediateNodeReference(Parent, node));
+            }
+            base.VisitMalformedDirective(node);
+        }
     }
 
     private class ReferenceVisitor<TNode> : IntermediateNodeWalker
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/ModelDirective.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/ModelDirective.cs
index 206d2d7efc0..88834aed408 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/ModelDirective.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/ModelDirective.cs
@@ -4,10 +4,7 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions;
@@ -43,28 +40,20 @@ public static string GetModelType(DocumentIntermediateNode document)
             throw new ArgumentNullException(nameof(document));
         }
 
-        var visitor = new Visitor();
-        return GetModelType(document, visitor).Content;
+        var @class = document.FindPrimaryClass();
+        return GetModelType(document, @class).Content;
     }
 
-    private static IntermediateToken GetModelType(DocumentIntermediateNode document, Visitor visitor)
+    private static IntermediateToken GetModelType(DocumentIntermediateNode document, ClassDeclarationIntermediateNode classNode)
     {
-        visitor.Visit(document);
-
-        for (var i = visitor.ModelDirectives.Count - 1; i >= 0; i--)
+        var directives = document.FindDirectiveReferences(Directive, includeMalformed: true);
+        if (directives is [IntermediateNodeReference { Node.Children: [DirectiveTokenIntermediateNode firstToken, ..] } , ..])
         {
-            var directive = visitor.ModelDirectives[i];
-
-            var tokens = directive.Tokens.ToArray();
-            if (tokens.Length >= 1)
-            {
-                return IntermediateToken.CreateCSharpToken(tokens[0].Content, tokens[0].Source);
-            }
+            return IntermediateToken.CreateCSharpToken(firstToken.Content, firstToken.Source);
         }
-
-        if (document.DocumentKind == RazorPageDocumentClassifierPass.RazorPageDocumentKind)
+        else if (document.DocumentKind == RazorPageDocumentClassifierPass.RazorPageDocumentKind)
         {
-            return IntermediateToken.CreateCSharpToken(visitor.Class.ClassName);
+            return IntermediateToken.CreateCSharpToken(classNode.ClassName);
         }
         else
         {
@@ -86,8 +75,8 @@ protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentInte
                 return;
             }
 
-            var visitor = new Visitor();
-            var modelType = GetModelType(documentNode, visitor);
+            var @class = documentNode.FindPrimaryClass();
+            var modelType = GetModelType(documentNode, @class);
 
             if (documentNode.Options.DesignTime)
             {
@@ -99,51 +88,15 @@ protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentInte
                     Content = $"TModel = {typeName}"
                 };
 
-                visitor.Namespace?.Children.Insert(0, usingNode);
+                var @namespace = documentNode.FindPrimaryNamespace();
+                @namespace?.Children.Insert(0, usingNode);
                 modelType.Source = null;
             }
 
-            if (visitor.Class?.BaseType is BaseTypeWithModel { ModelType: not null } existingBaseType)
+            if (@class?.BaseType is BaseTypeWithModel { ModelType: not null } existingBaseType)
             {
                 existingBaseType.ModelType = modelType;
             }
         }
     }
-
-    private class Visitor : IntermediateNodeWalker
-    {
-        public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
-
-        public ClassDeclarationIntermediateNode Class { get; private set; }
-
-        public IList<DirectiveIntermediateNode> ModelDirectives { get; } = new List<DirectiveIntermediateNode>();
-
-        public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
-        {
-            if (Namespace == null)
-            {
-                Namespace = node;
-            }
-
-            base.VisitNamespaceDeclaration(node);
-        }
-
-        public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
-        {
-            if (Class == null)
-            {
-                Class = node;
-            }
-
-            base.VisitClassDeclaration(node);
-        }
-
-        public override void VisitDirective(DirectiveIntermediateNode node)
-        {
-            if (node.Directive == Directive)
-            {
-                ModelDirectives.Add(node);
-            }
-        }
-    }
 }
diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Semantic/RazorSemanticTokensTests.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Semantic/RazorSemanticTokensTests.cs
index fcf08a26472..9b9d8dcf6dc 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Semantic/RazorSemanticTokensTests.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Semantic/RazorSemanticTokensTests.cs
@@ -54,7 +54,7 @@ @using Microsoft.AspNetCore.Components.Forms
         await TestServices.Editor.VerifyGetClassificationsAsync(expectedClassifications, ControlledHangMitigatingCancellationToken);
     }
 
-    [IdeFact(Skip = "https://github.com/dotnet/razor/issues/5595")] // Broken in FUSE due to @inherits bug
+    [IdeFact]
     public async Task Components_AreColored()
     {
         // Arrange
diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/ErrorCode.cs b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/ErrorCode.cs
index feb1b0102b5..8d445a70522 100644
--- a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/ErrorCode.cs
+++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/ErrorCode.cs
@@ -11,6 +11,7 @@ public enum ErrorCode
     ERR_BadIndexLHS = 21,
     ERR_NoImplicitConv = 29,
     ERR_NameNotInContext = 103,
+    ERR_OverrideNotExpected = 115,
     ERR_BadSKunknown = 119,
     ERR_ObjectRequired = 120,
     WRN_UnreferencedField = 169,