diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c
index 07684aae5..c3b2ec130 100644
--- a/hypervisor/arch/x86/guest/vm.c
+++ b/hypervisor/arch/x86/guest/vm.c
@@ -432,10 +432,13 @@ static void prepare_sos_vm_memmap(struct acrn_vm *vm)
 	pci_mmcfg = get_mmcfg_region();
 	ept_del_mr(vm, (uint64_t *)vm->arch_vm.nworld_eptp, pci_mmcfg->address, get_pci_mmcfg_size(pci_mmcfg));
 
-	/* TODO: remove Software SRAM from SOS prevent SOS to use clflush to flush the Software SRAM cache.
-	 * If we remove this EPT mapping from the SOS, the ACRN-DM can't do Software SRAM EPT mapping
-	 * because the SOS can't get the HPA of this memory region.
+#if defined(PRE_RTVM_SW_SRAM_ENABLED)
+	/* remove Software SRAM region from Service VM EPT, to prevent Service VM from using clflush to
+	 * flush the Software SRAM cache.
+	 * This is applicable to prelaunch RTVM case only, for post-launch RTVM, Service VM is trusted.
 	 */
+	ept_del_mr(vm, pml4_page, PRE_RTVM_SW_SRAM_BASE_GPA, PRE_RTVM_SW_SRAM_END_GPA - PRE_RTVM_SW_SRAM_BASE_GPA);
+#endif
 }
 
 /* Add EPT mapping of EPC reource for the VM */
diff --git a/hypervisor/include/arch/x86/rtct.h b/hypervisor/include/arch/x86/rtct.h
index cc1f413b1..f2406963d 100644
--- a/hypervisor/include/arch/x86/rtct.h
+++ b/hypervisor/include/arch/x86/rtct.h
@@ -21,7 +21,7 @@
 #define RTCT_ENTRY_TYPE_RT_IOMMU		8U
 #define RTCT_ENTRY_TYPE_MEM_HIERARCHY_LATENCY	9U
 
-#if !defined(PRE_RTVM_SW_SRAM_BASE_GPA)
+#if !defined(PRE_RTVM_SW_SRAM_ENABLED)
 /*
  * PRE_RTVM_SW_SRAM_BASE_GPA is for Prelaunch VM only and
  * is configured by config tool on platform that Software SRAM is detected.