diff --git a/src/stream_interface.c b/src/stream_interface.c
index d5f2c87..01e8ce5 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -455,9 +455,13 @@
 		oc->wex = TICK_ETERNITY;
 	}
 
-	/* indicate that we may be waiting for data from the output channel */
+	/* indicate that we may be waiting for data from the output channel or
+	 * we're about to close and can't expect more data if SHUTW_NOW is there.
+	 */
 	if ((oc->flags & (CF_SHUTW|CF_SHUTW_NOW)) == 0 && channel_may_recv(oc))
 		si->flags |= SI_FL_WAIT_DATA;
+	else if ((oc->flags & (CF_SHUTW|CF_SHUTW_NOW)) == CF_SHUTW_NOW)
+		si->flags &= ~SI_FL_WAIT_DATA;
 
 	/* update OC timeouts and wake the other side up if it's waiting for room */
 	if (oc->flags & CF_WRITE_ACTIVITY) {