diff --git a/src/AspNetCore/Inc/forwardinghandler.h b/src/AspNetCore/Inc/forwardinghandler.h
index 0213114b18..eb04a07b30 100644
--- a/src/AspNetCore/Inc/forwardinghandler.h
+++ b/src/AspNetCore/Inc/forwardinghandler.h
@@ -316,6 +316,7 @@ private:
     APP_OFFLINE_HTM                    *m_pAppOfflineHtm;
     APPLICATION                        *m_pApplication;
 
+    bool                                m_fWebSocketEnabled;
     bool                                m_fHandleClosedDueToClient;
     bool                                m_fResponseHeadersReceivedAndSet;
     BOOL                                m_fDoReverseRewriteHeaders;
@@ -325,20 +326,17 @@ private:
     BOOL                                m_fClientDisconnected;
     BOOL                                m_fHasError;
     DWORD                               m_msStartTime;
-        
     DWORD                               m_BytesToReceive;
     DWORD                               m_BytesToSend;
-
-    BYTE *                              m_pEntityBuffer;
     DWORD                               m_cchLastSend;
-
-    static const SIZE_T                 INLINE_ENTITY_BUFFERS = 8;
     DWORD                               m_cEntityBuffers;
-    BUFFER_T<BYTE*,INLINE_ENTITY_BUFFERS> m_buffEntityBuffers;
-
     DWORD                               m_cBytesBuffered;
     DWORD                               m_cMinBufferLimit;
 
+    BYTE *                              m_pEntityBuffer;
+    static const SIZE_T                 INLINE_ENTITY_BUFFERS = 8;
+    BUFFER_T<BYTE*,INLINE_ENTITY_BUFFERS> m_buffEntityBuffers;
+
     PCSTR                               m_pszOriginalHostHeader;
 
     FORWARDING_REQUEST_STATUS           m_RequestStatus;
@@ -348,8 +346,6 @@ private:
     PCWSTR                              m_pszHeaders;
     DWORD                               m_cchHeaders;
 
-    bool                                m_fWebSocketEnabled;
-
     STRU                                m_strFullUri;
 
     ULONGLONG                           m_cContentLength;
diff --git a/src/AspNetCore/Src/forwardinghandler.cxx b/src/AspNetCore/Src/forwardinghandler.cxx
index 2ddc077f88..763828fa60 100644
--- a/src/AspNetCore/Src/forwardinghandler.cxx
+++ b/src/AspNetCore/Src/forwardinghandler.cxx
@@ -2286,6 +2286,12 @@ None
         break;
 
     case WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING:
+        if (ANCMEvents::ANCM_REQUEST_FORWARD_END::IsEnabled(m_pW3Context->GetTraceContext()))
+        {
+            ANCMEvents::ANCM_REQUEST_FORWARD_END::RaiseEvent(
+                m_pW3Context->GetTraceContext(),
+                NULL);
+        }
         if (m_RequestStatus != FORWARDER_DONE)
         {
             hr = ERROR_CONNECTION_ABORTED;