diff --git a/doc/Changelog b/doc/Changelog
index 82fd320e7..94daab83b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+3 August 2021: George
+	- Listen to read or write events after the SSL handshake.
+	  Sticky events on windows would stick on read when write was needed.
+
 26 July 2021: George
 	- Merge #513: Stream reuse, attempt to fix #411, #439, #469. This
 	  introduces a couple of fixes for the stream reuse functionality
diff --git a/util/netevent.c b/util/netevent.c
index 01e44c9b6..9c99c677b 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1214,7 +1214,7 @@ ssl_handshake(struct comm_point* c)
 	int r;
 	if(c->ssl_shake_state == comm_ssl_shake_hs_read) {
 		/* read condition satisfied back to writing */
-		comm_point_listen_for_rw(c, 1, 1);
+		comm_point_listen_for_rw(c, 0, 1);
 		c->ssl_shake_state = comm_ssl_shake_none;
 		return 1;
 	}
@@ -1333,7 +1333,7 @@ ssl_handshake(struct comm_point* c)
 		if(c->ssl_shake_state != comm_ssl_shake_read)
 			comm_point_listen_for_rw(c, 1, 0);
 	} else {
-		comm_point_listen_for_rw(c, 1, 1);
+		comm_point_listen_for_rw(c, 0, 1);
 	}
 	c->ssl_shake_state = comm_ssl_shake_none;
 	return 1;