diff --git a/arch/arm64/kvm/hyp/nvhe/device/device.c b/arch/arm64/kvm/hyp/nvhe/device/device.c
index c4d0bb90b6b2..d3da14cbad09 100644
--- a/arch/arm64/kvm/hyp/nvhe/device/device.c
+++ b/arch/arm64/kvm/hyp/nvhe/device/device.c
@@ -31,6 +31,9 @@ int pkvm_init_devices(void)
 	size_t dev_sz;
 	int ret;
 
+	if (!registered_devices_nr)
+		return 0;
+
 	registered_devices = kern_hyp_va(registered_devices);
 	dev_sz = PAGE_ALIGN(size_mul(sizeof(struct pkvm_device),
 				     registered_devices_nr));