diff --git a/reactos/drivers/net/afd/afd/listen.c b/reactos/drivers/net/afd/afd/listen.c
index 70a354fe85d..26ef02e0fe7 100644
--- a/reactos/drivers/net/afd/afd/listen.c
+++ b/reactos/drivers/net/afd/afd/listen.c
@@ -242,6 +242,8 @@ NTSTATUS AfdAccept( PDEVICE_OBJECT DeviceObject, PIRP Irp,
 
     if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE );
 
+    FCB->EventsFired &= ~AFD_EVENT_ACCEPT;    
+
     if( FCB->NeedsNewListen ) {
 	AFD_DbgPrint(MID_TRACE,("ADDRESSFILE: %x\n", FCB->AddressFile.Handle));
 
diff --git a/reactos/drivers/net/afd/afd/read.c b/reactos/drivers/net/afd/afd/read.c
index 827d5a0fb4e..8437c2761a5 100644
--- a/reactos/drivers/net/afd/afd/read.c
+++ b/reactos/drivers/net/afd/afd/read.c
@@ -131,7 +131,7 @@ static VOID ProcessClose( PAFD_FCB FCB ) {
     }
     
     /* Handle closing signal */
-    FCB->PollState |= AFD_EVENT_CLOSE;
+    FCB->PollState |= AFD_EVENT_DISCONNECT;
 
     PollReeval( FCB->DeviceExt, FCB->FileObject );
 }