diff --git a/lightningd/channel/channel.c b/lightningd/channel/channel.c
index b2de1f6f3..6390c8359 100644
--- a/lightningd/channel/channel.c
+++ b/lightningd/channel/channel.c
@@ -701,6 +701,10 @@ static struct io_plan *send_revocation(struct io_conn *conn, struct peer *peer)
 
 	msg_enqueue(&peer->peer_out, take(msg));
 
+	/* This might have been the final revoke_and_ack... */
+	if (shutdown_complete(peer))
+		io_break(peer);
+
 	return peer_read_message(conn, &peer->pcs, peer_in);
 }