diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Mmu.c b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Mmu.c
index 6fa770edbf..7881a9b9fa 100644
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Mmu.c
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Mmu.c
@@ -222,10 +222,10 @@ ArmConfigureMmu (
 
   ArmCleanInvalidateDataCache ();
   ArmInvalidateInstructionCache ();
-  ArmInvalidateTlb ();
 
   ArmDisableDataCache ();
   ArmDisableInstructionCache();
+  // TLBs are also invalidated when calling ArmDisableMmu()
   ArmDisableMmu ();
 
   // Make sure nothing sneaked into the cache