diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index e93db060d3..8621930ea5 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1493,7 +1493,8 @@ connection_read( ber_socket_t s, conn_readinfo *cri )
 		slapd_set_write( s, 0 );
 	}
 
-	slapd_set_read( s, 1 );
+	if ( !cri->op || cri->op->o_tag != LDAP_REQ_UNBIND )
+		slapd_set_read( s, 1 );
 	connection_return( c );
 
 	return 0;