diff --git a/src/arch/aarch64/handler.c b/src/arch/aarch64/handler.c
index 39b3010..2f84a90 100644
--- a/src/arch/aarch64/handler.c
+++ b/src/arch/aarch64/handler.c
@@ -362,6 +362,8 @@
 		if (esr & 1) {
 			return NULL;
 		}
+		/* Skip the WFI instruction. */
+		vcpu->regs.pc += (esr & (1u << 25)) ? 4 : 2;
 		return api_wait_for_interrupt(current());
 
 	case 0x24: /* EC = 100100, Data abort. */