diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets b/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
index 8c8568ce58f08..723c636442bca 100644
--- a/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
+++ b/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
@@ -7,7 +7,12 @@
     <!-- .NETCoreApp < 3.0, .NETStandard < 2.1, or any other target framework -->
     <_MaxSupportedLangVersion Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp' OR '$(_TargetFrameworkVersionWithoutV)' &lt; '3.0') AND
                                          ('$(TargetFrameworkIdentifier)' != '.NETStandard' OR '$(_TargetFrameworkVersionWithoutV)' &lt; '2.1')">7.3</_MaxSupportedLangVersion>
-  
+
+    <!-- .NETCoreApp < 5.0, .NETStandard == 2.1 -->
+    <_MaxSupportedLangVersion Condition="(('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' &lt; '5.0') OR
+                                          ('$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(_TargetFrameworkVersionWithoutV)' == '2.1')) AND
+                                          '$(_MaxSupportedLangVersion)' == ''">8.0</_MaxSupportedLangVersion>
+
     <!-- 
       Set the base language version for .NET 5.0. 
       Based on the empirical pattern, each major .NET version release supports 
@@ -28,7 +33,7 @@
       - Adds this difference to the base language version (9) to dynamically determine the correct language version.
       This approach follows the observed pattern and ensures scalability for future versions.
     -->
-    <_MaxSupportedLangVersion Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_MaxSupportedLangVersion)' == '' AND '$(_TargetFrameworkVersionWithoutV)' != ''">
+    <_MaxSupportedLangVersion Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_MaxSupportedLangVersion)' == ''">
       $([MSBuild]::Add($(_BaseLangVersion), $([MSBuild]::Subtract($(_TargetFrameworkVersionWithoutV)), 5))))
     </_MaxSupportedLangVersion>