diff --git a/src/arch/aarch64/hypervisor/handler.c b/src/arch/aarch64/hypervisor/handler.c
index ac4a726..4852f69 100644
--- a/src/arch/aarch64/hypervisor/handler.c
+++ b/src/arch/aarch64/hypervisor/handler.c
@@ -408,6 +408,11 @@
 		return;
 	}
 
+	if (spci_handler(ret, next)) {
+		update_vi(*next);
+		return;
+	}
+
 	switch (func & ~SMCCC_CONVENTION_MASK) {
 	case HF_DEBUG_LOG:
 		ret->func = api_debug_log(vcpu->regs.r[1], vcpu);