diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
index c8ee1f7266..9d26b135f5 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
@@ -444,19 +444,22 @@ PxeBcDriverBindingStop (
   EFI_STATUS                  Status;
 
   NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiArpProtocolGuid);
-
   if (NicHandle == NULL) {
-
     NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiDhcp4ProtocolGuid);
 
     if (NicHandle == NULL) {
-
-      NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiMtftp4ProtocolGuid);
+      NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiIp4ProtocolGuid);
 
       if (NicHandle == NULL) {
+        NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiUdp4ProtocolGuid);
 
-        return EFI_DEVICE_ERROR;
+        if (NicHandle == NULL) {
+          NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiMtftp4ProtocolGuid);
 
+          if (NicHandle == NULL) {
+            return EFI_DEVICE_ERROR;
+          }
+        }
       }
     }
   }
@@ -526,6 +529,19 @@ PxeBcDriverBindingStop (
       Private->Mtftp4Child
       );
 
+    gBS->CloseProtocol (
+          Private->Ip4Child,
+          &gEfiIp4ProtocolGuid,
+          This->DriverBindingHandle,
+          NicHandle
+          );
+    NetLibDestroyServiceChild (
+      NicHandle,
+      This->DriverBindingHandle,
+      &gEfiIp4ServiceBindingProtocolGuid,
+      Private->Ip4Child
+      );
+
     gBS->CloseProtocol (
           Private->ArpChild,
           &gEfiArpProtocolGuid,