diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props
index bebb3cacec2..acaf5c8d836 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props
@@ -91,7 +91,8 @@
     <!-- C# specific settings -->
     <When Condition="'$(Language)' == 'C#'">
       <PropertyGroup>
-        <NoWarn>$(NoWarn);1701;1702;1705;1591</NoWarn>
+        <NoWarn>$(NoWarn);1701;1702;1705</NoWarn>
+        <NoWarn Condition="'$(SkipArcadeNoWarnCS1591)' != 'true'">$(NoWarn);1591</NoWarn>
       </PropertyGroup>
     </When>