diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32.c b/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
index 67a3ac0038..6559d316e7 100644
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
@@ -1018,15 +1018,14 @@ Returns:
   // Install the Driver Protocols
   //
 
-  Status = NetLibInstallAllDriverProtocolsWithUnload (
+  Status = EfiLibInstallAllDriverProtocols (
             ImageHandle,
             SystemTable,
             &gSnpNt32DriverBinding,
             ImageHandle,
             &gSnpNt32DriverComponentName,
             NULL,
-            NULL,
-            SnpNt32Unload
+            NULL
             );
   if (EFI_ERROR (Status)) {
     return Status;
diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf b/Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf
index 2896a83c34..abc0644db1 100644
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf
@@ -24,7 +24,7 @@
   EFI_SPECIFICATION_VERSION      = 0x00020000
 
   ENTRY_POINT                    = InitializeSnpNt32river
-
+  UNLOAD_IMAGE                   = SnpNt32Unload
 #
 # The following information is for reference only and not required by the build tools.
 #