diff --git a/pkg/tcpip/transport/tcp/accept.go b/pkg/tcpip/transport/tcp/accept.go
index 63058e420..c22ed5ea7 100644
--- a/pkg/tcpip/transport/tcp/accept.go
+++ b/pkg/tcpip/transport/tcp/accept.go
@@ -363,11 +363,6 @@ func (e *endpoint) protocolListenLoop(rcvWnd seqnum.Size) *tcpip.Error {
 		e.mu.Lock()
 		e.state = stateClosed
 
-		// Notify waiters that the endpoint is shutdown.
-		e.mu.Unlock()
-		e.waiterQueue.Notify(waiter.EventIn | waiter.EventOut)
-		e.mu.Lock()
-
 		// Do cleanup if needed.
 		e.completeWorkerLocked()
 
@@ -375,6 +370,9 @@ func (e *endpoint) protocolListenLoop(rcvWnd seqnum.Size) *tcpip.Error {
 			close(e.drainDone)
 		}
 		e.mu.Unlock()
+
+		// Notify waiters that the endpoint is shutdown.
+		e.waiterQueue.Notify(waiter.EventIn | waiter.EventOut)
 	}()
 
 	e.mu.Lock()