diff --git a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.Common.targets b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.Common.targets
index a0ee8d347f34..55462cab2279 100644
--- a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.Common.targets
+++ b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.Common.targets
@@ -29,5 +29,6 @@
 		<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="EnableDiagnostics" />
     <CompilerVisibleProperty Include="MauiXamlLineInfo" />
 		<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="LineInfo" />
+    <CompilerVisibleProperty Include="Configuration" />
 	</ItemGroup>
 </Project>
diff --git a/src/Controls/src/SourceGen/ProjectItem.cs b/src/Controls/src/SourceGen/ProjectItem.cs
index 63c18b382a55..c1e3bc5f2056 100644
--- a/src/Controls/src/SourceGen/ProjectItem.cs
+++ b/src/Controls/src/SourceGen/ProjectItem.cs
@@ -32,7 +32,11 @@ public bool EnableDiagnostics
 				return true;
 			if (Options.IsFalse("build_metadata.additionalfiles.EnableDiagnostics"))
 				return false;
-			return Options.IsTrue("build_property.EnableMauiXamlDiagnostics");
+			if (Options.IsTrue("build_property.EnableMauiXamlDiagnostics"))
+				return true;
+			if (Options.IsFalse("build_property.EnableMauiXamlDiagnostics"))
+				return false;
+			return !Configuration.Equals("Release", StringComparison.OrdinalIgnoreCase);
 		}
 	}