diff --git a/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/RazorQueryGenerator.cs b/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/RazorQueryGenerator.cs
index 1b99c1627f9..08b28ac2870 100644
--- a/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/RazorQueryGenerator.cs
+++ b/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/RazorQueryGenerator.cs
@@ -34,7 +34,7 @@ protected override CSharpSyntaxGeneratorResult Generate(
                     Token(modifier),
                     Token(SyntaxKind.PartialKeyword))
                 .AddGeneratedAttribute()
-                .AddMembers(CreateOperationProperty(descriptor.RuntimeType.ToString()));
+                .AddMembers(CreateOperationProperty(descriptor.InterfaceType.ToString()));
 
         foreach (var argument in descriptor.Arguments)
         {
diff --git a/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/RazorSubscriptionGenerator.cs b/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/RazorSubscriptionGenerator.cs
index 8786c4715f9..92be3154224 100644
--- a/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/RazorSubscriptionGenerator.cs
+++ b/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/RazorSubscriptionGenerator.cs
@@ -34,7 +34,7 @@ protected override CSharpSyntaxGeneratorResult Generate(
                     Token(modifier),
                     Token(SyntaxKind.PartialKeyword))
                 .AddGeneratedAttribute()
-                .AddMembers(CreateOperationProperty(descriptor.RuntimeType.ToString()));
+                .AddMembers(CreateOperationProperty(descriptor.InterfaceType.ToString()));
 
         foreach (var argument in descriptor.Arguments)
         {
diff --git a/src/StrawberryShake/CodeGeneration/test/CodeGeneration.Razor.Tests/__snapshots__/RazorGeneratorTests.Query_And_Mutation.snap b/src/StrawberryShake/CodeGeneration/test/CodeGeneration.Razor.Tests/__snapshots__/RazorGeneratorTests.Query_And_Mutation.snap
index c3de0b37310..8824872bf3b 100644
--- a/src/StrawberryShake/CodeGeneration/test/CodeGeneration.Razor.Tests/__snapshots__/RazorGeneratorTests.Query_And_Mutation.snap
+++ b/src/StrawberryShake/CodeGeneration/test/CodeGeneration.Razor.Tests/__snapshots__/RazorGeneratorTests.Query_And_Mutation.snap
@@ -1317,7 +1317,7 @@ namespace Foo.Bar.Components
     public partial class UseGetBars : global::StrawberryShake.Razor.UseQuery<global::Foo.Bar.IGetBarsResult>
     {
         [global::Microsoft.AspNetCore.Components.InjectAttribute]
-        internal global::Foo.Bar.GetBarsQuery Operation { get; set; } = default !;
+        internal global::Foo.Bar.IGetBarsQuery Operation { get; set; } = default !;
 
         [global::Microsoft.AspNetCore.Components.ParameterAttribute]
         public global::System.String A { get; set; } = default !;