diff --git a/plat/fvp/aarch64/fvp_common.c b/plat/fvp/aarch64/fvp_common.c
index 78a44a5..0b5f4eb 100644
--- a/plat/fvp/aarch64/fvp_common.c
+++ b/plat/fvp/aarch64/fvp_common.c
@@ -461,7 +461,7 @@
 		  TCR_RGN_INNER_WBA | TCR_T0SZ_4GB;
 	if (GET_EL(current_el) == MODE_EL3) {
 		tcr |= TCR_EL3_RES1;
-		/* Invalidate all TLBs */
+		/* Invalidate EL3 TLBs */
 		tlbialle3();
 	} else {
 		/* Invalidate EL1 TLBs */
@@ -491,9 +491,6 @@
 	write_ttbr0(0);
 	write_sctlr(0);
 
-	/* Invalidate TLBs of the CurrentEL */
-	tlbiall();
-
 	/* Flush the caches */
 	dcsw_op_all(DCCISW);