diff --git a/src/mono/wasi/build/WasiApp.InTree.props b/src/mono/wasi/build/WasiApp.InTree.props
index 894b17f646e38..b85fd737856dc 100644
--- a/src/mono/wasi/build/WasiApp.InTree.props
+++ b/src/mono/wasi/build/WasiApp.InTree.props
@@ -11,12 +11,4 @@
     <TrimMode>partial</TrimMode>
     <RunAnalyzers>false</RunAnalyzers>
   </PropertyGroup>
-  <!-- This is temporary hack for https://github.com/dotnet/runtime/issues/61294 -->
-  <ItemGroup>
-    <_MonoRuntimeComponentDontLink Include="libmono-component-debugger-stub-static.a" />
-    <!-- FIXME: This will exclude the diagnostics component if tracing is not on and threads are not on.  Which means that if you turn on threading, you will get diagnostics.  Is this what we want? -->
-    <_MonoRuntimeComponentDontLink Include="libmono-component-diagnostics_tracing-static.a" Condition="'$(FeatureWasmPerfTracing)' != 'true' and $(FeatureWasmManagedThreads) != 'true'"/>
-    <_MonoRuntimeComponentDontLink Include="libmono-component-hot_reload-stub-static.a" />
-    <_MonoRuntimeComponentDontLink Include="libmono-component-marshal-ilgen-stub-static.a" />
-  </ItemGroup>
 </Project>
diff --git a/src/mono/wasi/build/WasiApp.targets b/src/mono/wasi/build/WasiApp.targets
index b229d76dd71ff..37d6d40d1f172 100644
--- a/src/mono/wasi/build/WasiApp.targets
+++ b/src/mono/wasi/build/WasiApp.targets
@@ -23,6 +23,16 @@
       _WasmGenerateNodeScripts;
     </WasmGenerateAppBundleDependsOn>
 
+    <WasiWriteRspForLinkingDependsOn>
+      $(WasiWriteRspForLinkingDependsOn);
+      _WasmSelectRuntimeComponentsForLinking;
+      _WasiGetWasiOutputFileName;
+    </WasiWriteRspForLinkingDependsOn>
+    <WasiWriteRspForLinkingDependsOn Condition="'$(UsingWasiRuntimeWorkload)' == 'true'">
+      $(WasiWriteRspForLinkingDependsOn);
+      _MonoSelectRuntimeComponents;
+    </WasiWriteRspForLinkingDependsOn>
+
     <SelfContained Condition="'$(IsWasiProject)' == 'true'">true</SelfContained>
 
     <!-- Temporarily `false`, till sdk gets a fix for supporting the new file -->
@@ -261,7 +271,7 @@
   </Target>
 
   <Target Name="_WasiWriteRspForLinking"
-          DependsOnTargets="_WasmSelectRuntimeComponentsForLinking;_WasiGetWasiOutputFileName"
+          DependsOnTargets="$(WasiWriteRspForLinkingDependsOn)"
           BeforeTargets="_WasmWriteRspForLinking"
           Returns="@(_WasmLinkStepArgs)">
 
@@ -296,12 +306,15 @@
       <_WasmSIMDLibToExclude Condition="'$(WasmEnableSIMD)' == 'true'">libmono-wasm-nosimd.a</_WasmSIMDLibToExclude>
     </PropertyGroup>
 
+    <ItemGroup>
+      <_MonoRuntimeComponentDontLink Include="wasm-bundled-timezones.a" Condition="'$(InvariantTimezone)' == 'true'"/>
+      <_MonoRuntimeComponentDontLink Include="libmono-component-diagnostics_tracing-static.a" Condition="'$(UsingWasiRuntimeWorkload)' != 'true'" /> <!-- Just for in-tree build + CI -->
+    </ItemGroup>
+
     <ItemGroup>
       <!-- order matters -->
       <_WasmNativeFileForLinking Include="%(_BitcodeFile.ObjectFile)" />
       <!--<_WasmNativeFileForLinking Include="%(_WasmSourceFileToCompile.ObjectFile)" />-->
-      <_MonoRuntimeComponentDontLink Include="libmono-component-diagnostics_tracing-static.a" />
-      <_MonoRuntimeComponentDontLink Include="wasm-bundled-timezones.a" Condition="'$(InvariantTimezone)' == 'true'"/>
 
       <_WasmNativeFileForLinking
           Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)*.a"
@@ -440,4 +453,4 @@ wasi.start(instance);
   </Target>
 
   <!--<Target Name="_WasmCalculateInitialHeapSize" />-->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets
index 5c7e4353fee0a..7e4c7d343417f 100644
--- a/src/mono/wasm/build/WasmApp.Common.targets
+++ b/src/mono/wasm/build/WasmApp.Common.targets
@@ -251,9 +251,16 @@
   <ItemGroup>
     <UpToDateCheckInput Include="@(NativeFileReference)" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(Configuration)' == 'Debug' and '@(_MonoComponent->Count())' == 0">
-    <_MonoComponent Include="hot_reload;debugger" />
+  
+  <PropertyGroup>
+    <_WasmDebuggerSupport Condition="'$(WasmDebugLevel)' != '' and '$(WasmDebugLevel)' != '0'">true</_WasmDebuggerSupport>
+    <_WasmDebuggerSupport Condition="'$(WasmDebugLevel)' != '' and '$(WasmDebugLevel)' == '0'">false</_WasmDebuggerSupport>
+    <_WasmDebuggerSupport Condition="'$(_WasmDebuggerSupport)' == '' and '$(WasmBuildingForNestedPublish)' == 'true'">false</_WasmDebuggerSupport> <!-- publish -->
+    <_WasmDebuggerSupport Condition="'$(_WasmDebuggerSupport)' == ''">true</_WasmDebuggerSupport>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(_WasmDebuggerSupport)' == 'true'">
+    <_MonoComponent Include="debugger" />
+    <_MonoComponent Include="hot_reload" />
   </ItemGroup>
   <!-- PUBLISH -->
 
@@ -590,7 +597,7 @@
   </Target>
 
   <Target Name="_ScanAssembliesDecideLightweightMarshaler">
-     <ItemGroup>
+    <ItemGroup>
       <_AssembliesToScan Include="@(_WasmAssembliesInternal)" />
     </ItemGroup>