diff --git a/MdeModulePkg/Core/Dxe/Hand.h b/MdeModulePkg/Core/Dxe/Hand.h
index fb2d017fdd..8be7e58d60 100644
--- a/MdeModulePkg/Core/Dxe/Hand.h
+++ b/MdeModulePkg/Core/Dxe/Hand.h
@@ -55,7 +55,7 @@ typedef struct {
 #define PROTOCOL_INTERFACE_SIGNATURE  EFI_SIGNATURE_32('p','i','f','c')
 typedef struct {
   UINTN                       Signature;
-  EFI_HANDLE                  Handle;     // Back pointer
+  IHANDLE                     *Handle;    // Back pointer
   LIST_ENTRY                  Link;       // Link on IHANDLE.Protocols
   LIST_ENTRY                  ByProtocol; // Link on PROTOCOL_ENTRY.Protocols
   PROTOCOL_ENTRY              *Protocol;  // The protocol ID
diff --git a/MdeModulePkg/Core/Dxe/Hand/Locate.c b/MdeModulePkg/Core/Dxe/Hand/Locate.c
index 7b1cf2a7dd..de3152107b 100644
--- a/MdeModulePkg/Core/Dxe/Hand/Locate.c
+++ b/MdeModulePkg/Core/Dxe/Hand/Locate.c
@@ -334,7 +334,7 @@ CoreGetNextLocateByRegisterNotify (
     Link = ProtNotify->Position->ForwardLink;
     if (Link != &ProtNotify->Protocol->Protocols) {
       Prot = CR (Link, PROTOCOL_INTERFACE, ByProtocol, PROTOCOL_INTERFACE_SIGNATURE);
-      Handle = (IHANDLE *) Prot->Handle;
+      Handle = Prot->Handle;
       *Interface = Prot->Interface;
     }
   }
@@ -385,7 +385,7 @@ CoreGetNextLocateByProtocol (
     // Get the handle
     //
     Prot = CR(Link, PROTOCOL_INTERFACE, ByProtocol, PROTOCOL_INTERFACE_SIGNATURE);
-    Handle = (IHANDLE *) Prot->Handle;
+    Handle = Prot->Handle;
     *Interface = Prot->Interface;
 
     //