diff --git a/build/nuget/uno.winui.targets b/build/nuget/uno.winui.targets
index 0beb9f1738..ed93b8bc31 100644
--- a/build/nuget/uno.winui.targets
+++ b/build/nuget/uno.winui.targets
@@ -21,4 +21,18 @@
 	<Import Project="../uno.winui.runtime-replace.targets" Condition="'$(_UnoIsWinAppSDKDefined)'!='true'" />
 
 	<Import Project="../uno.winui.winappsdk.targets" Condition="'$(_UnoIsWinAppSDKDefined)'=='true'" />
+
+	<!-- HD workaround for https://github.com/dotnet/sdk/issues/1212, see HD#2924 -->
+	<Target Name="_RemoveHDAnalyzerRelease"
+			BeforeTargets="CoreCompile;XamlPreCompile"
+			Condition=" '$(Optimize)' == 'true' ">
+		<!---
+		Remove HD analyzers in release mode, as they cannot work in release mode.
+		-->
+		<ItemGroup>
+			<_HDAnalyzerToRemove Include="@(Analyzer)" Condition="'%(Analyzer.NuGetPackageId)'=='Uno.UI.HotDesign'" />
+			<Analyzer Remove="@(_HDAnalyzerToRemove)"/>
+		</ItemGroup>
+	</Target>
+
 </Project>
diff --git a/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets b/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
index 9bc7dfe1dd..6c9e0a81f3 100644
--- a/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
+++ b/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
@@ -109,17 +109,4 @@
 	<ItemGroup>
 		<PackageReference Include="@(_UnoProjectSystemPackageReference)" Exclude="@(PackageReference)" />
 	</ItemGroup>
-
-	<!-- HD workaround for https://github.com/dotnet/sdk/issues/1212, see HD#2924 -->
-	<Target Name="_RemoveHDAnalyzerRelease"
-			BeforeTargets="CoreCompile;XamlPreCompile"
-			Condition=" '$(Optimize)' == 'true' ">
-		<!---
-		Remove HD analyzers in release mode, as they cannot work in release mode.
-		-->
-		<ItemGroup>
-			<_HDAnalyzerToRemove Include="@(Analyzer)" Condition="'%(Analyzer.NuGetPackageId)'=='Uno.UI.HotDesign'" />
-			<Analyzer Remove="@(_HDAnalyzerToRemove)"/>
-		</ItemGroup>
-	</Target>
 </Project>