diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
index aea31e461e..2268e6df82 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
@@ -469,7 +469,8 @@ ERROR:
 **/
 VOID
 MnpFlushServiceData (
-  MNP_SERVICE_DATA  *MnpServiceData
+  IN MNP_SERVICE_DATA  *MnpServiceData,
+  IN EFI_HANDLE        ImageHandle
   )
 {
   NET_CHECK_SIGNATURE (MnpServiceData, MNP_SERVICE_DATA_SIGNATURE);
@@ -516,7 +517,7 @@ MnpFlushServiceData (
   gBS->CloseProtocol (
         MnpServiceData->ControllerHandle,
         &gEfiSimpleNetworkProtocolGuid,
-        This->DriverBindingHandle,
+        ImageHandle,
         MnpServiceData->ControllerHandle
         );
 }
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
index 1c02e73f68..7284fd73b5 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
@@ -166,7 +166,7 @@ ErrorExit:
       //
       // Flush the Mnp Service Data.
       //
-      MnpFlushServiceData (MnpServiceData);
+      MnpFlushServiceData (MnpServiceData, This->DriverBindingHandle);
     }
 
     gBS->FreePool (MnpServiceData);
@@ -250,7 +250,7 @@ MnpDriverBindingStop (
     //
     // Flush the Mnp service data.
     //
-    MnpFlushServiceData (MnpServiceData);
+    MnpFlushServiceData (MnpServiceData, This->DriverBindingHandle);
 
     gBS->FreePool (MnpServiceData);
   } else {
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h b/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
index 436dbeb674..4b62967902 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2005 - 2007, Intel Corporation
+Copyright (c) 2005 - 2008, Intel Corporation
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -105,7 +105,8 @@ MnpInitializeServiceData (
 
 VOID
 MnpFlushServiceData (
-  MNP_SERVICE_DATA  *MnpServiceData
+  IN MNP_SERVICE_DATA  *MnpServiceData,
+  IN EFI_HANDLE        ImageHandle
   );
 
 VOID