diff --git a/hypervisor/common/hypercall.c b/hypervisor/common/hypercall.c
index c32e31f0a..1edd69612 100644
--- a/hypervisor/common/hypercall.c
+++ b/hypervisor/common/hypercall.c
@@ -482,7 +482,7 @@ int32_t hcall_notify_ioreq_finish(uint16_t vmid, uint16_t vcpu_id)
 	dev_dbg(ACRN_DBG_HYCALL, "[%d] NOTIFY_FINISH for vcpu %d",
 			vmid, vcpu_id);
 
-	if (vcpu_id >= CONFIG_MAX_VCPUS_PER_VM) {
+	if (vcpu_id >= target_vm->hw.created_vcpus) {
 		pr_err("%s, failed to get VCPU %d context from VM %d\n",
 			__func__, vcpu_id, target_vm->vm_id);
 		return -EINVAL;