diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index b1b307862a84..61b32c561f43 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -1625,13 +1625,19 @@
 
 		<WriteLinesToFile SessionId="$(BuildSessionId)" File="$(_MtouchSymbolsList)" Lines="@(_ProcessedReferenceNativeSymbol)" Overwrite="true" />
 
+		<PropertyGroup>
+			<!-- There are known bugs in the classic linker with Xcode 15, so keep use the classic linker in that case -->
+			<!-- In Xcode 16 we don't know of any problems for now, so enable the new linker by default -->
+			<_UseClassicLinker Condition="'$(_UseClassicLinker)' == '' And $([MSBuild]::VersionGreaterThanOrEquals('$(_XcodeVersion)', '16.0'))">false</_UseClassicLinker>
+			<_UseClassicLinker Condition="'$(_UseClassicLinker)' == '' And $([MSBuild]::VersionGreaterThanOrEquals('$(_XcodeVersion)', '15.0'))">true</_UseClassicLinker>
+		</PropertyGroup>
+
 		<ItemGroup>
 			<_AllLinkerFlags Include="@(_AssemblyLinkerFlags);@(_MainLinkerFlags);@(_CustomLinkFlags)" />
 			<_AllLinkerFlags Condition="'$(_ExportSymbolsExplicitly)' != 'true'" Include="@(_ProcessedReferenceNativeSymbol->'-u%(Identity)')" />
 
-			<!-- check if needs to be removed: https://github.com/xamarin/xamarin-macios/issues/18693 -->
-			<_AllLinkerFlags Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(_XcodeVersion)', '15.0')) And '$(_UseClassicLinker)' != 'false'" Include="-Xlinker" />
-			<_AllLinkerFlags Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(_XcodeVersion)', '15.0')) And '$(_UseClassicLinker)' != 'false'" Include="-ld_classic" />
+			<_AllLinkerFlags Condition="'$(_UseClassicLinker)' == 'true'" Include="-Xlinker" />
+			<_AllLinkerFlags Condition="'$(_UseClassicLinker)' == 'true'" Include="-ld_classic" />
 		</ItemGroup>
 
 		<LinkNativeCode
diff --git a/tools/common/Application.cs b/tools/common/Application.cs
index 385773aa1cab..19685c7a962c 100644
--- a/tools/common/Application.cs
+++ b/tools/common/Application.cs
@@ -174,7 +174,6 @@ public bool IsDefaultMarshalManagedExceptionMode {
 
 		public bool SkipMarkingNSObjectsInUserAssemblies { get; set; }
 
-		// check if needs to be removed: https://github.com/xamarin/xamarin-macios/issues/18693
 		public bool DisableAutomaticLinkerSelection { get; set; }
 
 		// assembly_build_targets describes what kind of native code each assembly should be compiled into for mobile targets (iOS, tvOS, watchOS).
diff --git a/tools/common/CompilerFlags.cs b/tools/common/CompilerFlags.cs
index 5956cd08864c..7bf08e067f86 100644
--- a/tools/common/CompilerFlags.cs
+++ b/tools/common/CompilerFlags.cs
@@ -239,8 +239,9 @@ public void WriteArguments (IList<string> args)
 				}
 			}
 
-			// check if needs to be removed: https://github.com/xamarin/xamarin-macios/issues/18693
-			if (Driver.XcodeVersion.Major >= 15 && !Application.DisableAutomaticLinkerSelection) {
+			// There are known bugs in the classic linker with Xcode 15, so keep use the classic linker in that case
+			//  In Xcode 16 we don't know of any problems for now, so enable the new linker by default
+			if (Driver.XcodeVersion.Major >= 15 && Driver.XcodeVersion.Major < 16 && !Application.DisableAutomaticLinkerSelection) {
 				args.Insert (0, "-Xlinker");
 				args.Insert (1, "-ld_classic");
 			}