diff --git a/soc/intel/intel_adsp/Kconfig.defconfig b/soc/intel/intel_adsp/Kconfig.defconfig
index 0fa4115c617..d76faf02def 100644
--- a/soc/intel/intel_adsp/Kconfig.defconfig
+++ b/soc/intel/intel_adsp/Kconfig.defconfig
@@ -7,6 +7,13 @@ if SOC_FAMILY_INTEL_ADSP
 
 rsource "*/Kconfig.defconfig.series"
 
+# A workaround for HWMv2 to recover SOF arch/xtensa defaults overridden by arch/host.
+if SOF
+config CORE_COUNT
+	int
+	default MP_MAX_NUM_CPUS
+endif
+
 config XTENSA_RPO_CACHE
 	def_bool y