diff --git a/OvmfPkg/IoMmuDxe/AmdSevIoMmu.c b/OvmfPkg/IoMmuDxe/AmdSevIoMmu.c
index 9540624427..8c2c23356a 100644
--- a/OvmfPkg/IoMmuDxe/AmdSevIoMmu.c
+++ b/OvmfPkg/IoMmuDxe/AmdSevIoMmu.c
@@ -499,7 +499,7 @@ EDKII_IOMMU_PROTOCOL  mAmdSev = {
   Initialize Iommu Protocol.
 
 **/
-VOID
+EFI_STATUS
 EFIAPI
 AmdSevInstallIoMmuProtocol (
   VOID
@@ -514,5 +514,5 @@ AmdSevInstallIoMmuProtocol (
                   &gEdkiiIoMmuProtocolGuid, &mAmdSev,
                   NULL
                   );
-  ASSERT_EFI_ERROR (Status);
+  return Status;
 }
diff --git a/OvmfPkg/IoMmuDxe/AmdSevIoMmu.h b/OvmfPkg/IoMmuDxe/AmdSevIoMmu.h
index 982e41a7b0..17d3694e4a 100644
--- a/OvmfPkg/IoMmuDxe/AmdSevIoMmu.h
+++ b/OvmfPkg/IoMmuDxe/AmdSevIoMmu.h
@@ -35,7 +35,7 @@
   MemEncryptSevLib.
 
 **/
-VOID
+EFI_STATUS
 EFIAPI
 AmdSevInstallIoMmuProtocol (
   VOID
diff --git a/OvmfPkg/IoMmuDxe/IoMmuDxe.c b/OvmfPkg/IoMmuDxe/IoMmuDxe.c
index 27b1856e0a..0ea42cbc13 100644
--- a/OvmfPkg/IoMmuDxe/IoMmuDxe.c
+++ b/OvmfPkg/IoMmuDxe/IoMmuDxe.c
@@ -36,14 +36,12 @@ IoMmuDxeEntryPoint (
   EFI_STATUS    Status;
   EFI_HANDLE    Handle;
 
-  Status = EFI_SUCCESS;
-
   //
   // When SEV is enabled, install IoMmu protocol otherwise install the
   // placeholder protocol so that other dependent module can run.
   //
   if (MemEncryptSevIsEnabled ()) {
-    AmdSevInstallIoMmuProtocol ();
+    Status = AmdSevInstallIoMmuProtocol ();
   } else {
     Handle = NULL;