diff --git a/src/stream.c b/src/stream.c
index a5c5f45..64875c8 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -954,8 +954,9 @@
 		si_chk_rcv(si);
 	}
 	req->wex = TICK_ETERNITY;
-	/* If we managed to get the whole response, switch to SI_ST_DIS now. */
-	if (rep->flags & CF_SHUTR)
+	/* If we managed to get the whole response, and we don't have anything
+	 * left to send, or can't, switch to SI_ST_DIS now. */
+	if (rep->flags & (CF_SHUTR | CF_SHUTW))
 		si->state = SI_ST_DIS;
 }