diff --git a/drivers/network/afd/afd/listen.c b/drivers/network/afd/afd/listen.c
index 9df56fc9b82..6159c18140f 100644
--- a/drivers/network/afd/afd/listen.c
+++ b/drivers/network/afd/afd/listen.c
@@ -142,6 +142,8 @@ static NTSTATUS NTAPI ListenComplete
 				 ListEntry ) );
     }
 
+    if( FCB->ListenIrp.ConnectionCallInfo ) ExFreePool( FCB->ListenIrp.ConnectionCallInfo );
+    if( FCB->ListenIrp.ConnectionReturnInfo ) ExFreePool( FCB->ListenIrp.ConnectionReturnInfo );
     FCB->NeedsNewListen = TRUE;
 
     /* Trigger a select return if appropriate */
diff --git a/drivers/network/afd/afd/main.c b/drivers/network/afd/afd/main.c
index 8d5b914042d..a689ce56098 100644
--- a/drivers/network/afd/afd/main.c
+++ b/drivers/network/afd/afd/main.c
@@ -193,9 +193,6 @@ VOID DestroySocket( PAFD_FCB FCB ) {
 	    InFlightRequest[i]->InFlightRequest->IoStatus.Status = STATUS_CANCELLED;
 	    InFlightRequest[i]->InFlightRequest->IoStatus.Information = 0;
 	    IoCancelIrp( InFlightRequest[i]->InFlightRequest );
-	    InFlightRequest[i]->InFlightRequest = NULL;
-	    if( InFlightRequest[i]->ConnectionCallInfo ) ExFreePool( InFlightRequest[i]->ConnectionCallInfo );
-	    if( InFlightRequest[i]->ConnectionReturnInfo ) ExFreePool( InFlightRequest[i]->ConnectionReturnInfo );
 	}
     }