diff --git a/src/mux_h2.c b/src/mux_h2.c
index 4567b8ff0..733687e7b 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -1399,6 +1399,8 @@ static int h2c_handle_goaway(struct h2c *h2c)
 	last = h2_get_n32(h2c->dbuf, 0);
 	h2c->errcode = h2_get_n32(h2c->dbuf, 4);
 	h2_wake_some_streams(h2c, last, CS_FL_ERROR);
+	if (h2c->last_sid < 0)
+		h2c->last_sid = last;
 	return 1;
 
  conn_err: