diff --git a/grub-core/loader/slaunch/dlstub.c b/grub-core/loader/slaunch/dlstub.c
index dbbd46f7d1..6882ce0c4c 100644
--- a/grub-core/loader/slaunch/dlstub.c
+++ b/grub-core/loader/slaunch/dlstub.c
@@ -52,6 +52,8 @@ void dl_entry (grub_uint64_t dl_ctx)
 
   if (slparams->platform_type == SLP_INTEL_TXT)
     {
+      grub_tpm_relinquish_locality (0);
+
       err = grub_set_mtrrs_for_acmod ((void *)(grub_addr_t)slparams->dce_base);
       if (err)
         {
diff --git a/grub-core/loader/slaunch/txt.c b/grub-core/loader/slaunch/txt.c
index 3f9cb54119..caa6f21573 100644
--- a/grub-core/loader/slaunch/txt.c
+++ b/grub-core/loader/slaunch/txt.c
@@ -1085,9 +1085,6 @@ grub_txt_boot_prepare (struct grub_slaunch_params *slparams)
   grub_setup_slr_table (slparams, (struct grub_slr_entry_hdr *)&slr_intel_info_staging);
   set_txt_info_ptr (slparams, os_mle_data);
 
-  grub_tpm_relinquish_locality (0);
-  grub_dprintf ("slaunch", "Relinquished TPM locality 0\n");
-
   grub_dprintf ("slaunch", "CPU prepared for secure launch\n");
 
   if (!(grub_rdmsr (GRUB_MSR_X86_APICBASE) & GRUB_MSR_X86_APICBASE_BSP))