diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs
index cd118782e..e4df94b76 100644
--- a/vmm/src/vm.rs
+++ b/vmm/src/vm.rs
@@ -2840,10 +2840,13 @@ impl Vm {
         let rsdp_addr = self.create_acpi_tables();
 
         #[cfg(not(target_arch = "riscv64"))]
-        // Configure shared state based on loaded kernel
-        entry_point
-            .map(|entry_point| self.configure_system(rsdp_addr, entry_point))
-            .transpose()?;
+        // Configure shared state based on loaded kernel.
+        // Skip for SEV-SNP guests where system configuration is provided via IGVM.
+        if rsdp_addr.is_some() {
+            entry_point
+                .map(|entry_point| self.configure_system(rsdp_addr, entry_point))
+                .transpose()?;
+        }
 
         #[cfg(target_arch = "riscv64")]
         self.configure_system().unwrap();