diff --git a/plat/common/aarch64/platform_helpers.S b/plat/common/aarch64/platform_helpers.S
index 0863830..a134ded 100644
--- a/plat/common/aarch64/platform_helpers.S
+++ b/plat/common/aarch64/platform_helpers.S
@@ -130,6 +130,7 @@
 	 * -----------------------------------------------------
 	 */
 func plat_error_handler
+	wfi
 	b	plat_error_handler
 endfunc plat_error_handler
 
@@ -139,5 +140,6 @@
 	 * -----------------------------------------------------
 	 */
 func plat_panic_handler
+	wfi
 	b	plat_panic_handler
 endfunc plat_panic_handler