diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c
index 30944004ae..f1e3e53411 100644
--- a/NetworkPkg/HttpDxe/HttpImpl.c
+++ b/NetworkPkg/HttpDxe/HttpImpl.c
@@ -1130,6 +1130,18 @@ Exit:
   }
   Token->Status = Status;
   gBS->SignalEvent (Token->Event);
+
+  if (Wrap != NULL) {
+    if (Wrap->TcpWrap.RxToken.CompletionToken.Event != NULL) {
+      gBS->CloseEvent (Wrap->TcpWrap.RxToken.CompletionToken.Event);
+    }
+  }
+  
+  if (HttpInstance->RxToken.CompletionToken.Event != NULL) {
+    gBS->CloseEvent (HttpInstance->RxToken.CompletionToken.Event);
+    HttpInstance->RxToken.CompletionToken.Event = NULL;
+  }  
+  
   FreePool (Wrap);
   return Status;