diff --git a/include/types/stream.h b/include/types/stream.h
index eb31f06..90819e6 100644
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -56,7 +56,7 @@
 #define SF_CURR_SESS	0x00000040	/* a connection is currently being counted on the server */
 /* unused: 0x00000080 */
 #define SF_REDISP	0x00000100	/* set if this stream was redispatched from one server to another */
-/* unused: 0x00000200 */
+#define SF_IGNORE	0x00000200      /* The stream lead to a mux upgrade, and should be ignored */
 #define SF_REDIRECTABLE	0x00000400	/* set if this stream is redirectable (GET or HEAD) */
 #define SF_HTX          0x00000800      /* set if this stream is an htx stream */
 
diff --git a/src/proxy.c b/src/proxy.c
index fe3944e..9d99ade 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1457,7 +1457,20 @@
 					    &s->si[0].wait_event);
 				if (conn_upgrade_mux_fe(conn, cs, &s->req.buf, ist(""), PROTO_MODE_HTTP)  == -1)
 					return 0;
-				s->flags |= SF_HTX;
+				if (!strcmp(conn->mux->name, "H2")) {
+					/* For HTTP/2, destroy the conn_stream,
+					 * disable logging, and pretend that we
+					 * failed, to that the stream is
+					 * silently destroyed. The new mux
+					 * will create new streams.
+					 */
+					cs_destroy(cs);
+					si_detach_endpoint(&s->si[0]);
+					s->logs.logwait = 0;
+					s->logs.level = 0;
+					s->flags |= SF_IGNORE;
+					return 0;
+				}
 			}
 		}
 
diff --git a/src/stream.c b/src/stream.c
index b22eef2..a135dcb 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -2611,7 +2611,7 @@
 	}
 
 	if (likely((si_f->state != SI_ST_CLO) || !si_state_in(si_b->state, SI_SB_INI|SI_SB_CLO))) {
-		if ((sess->fe->options & PR_O_CONTSTATS) && (s->flags & SF_BE_ASSIGNED))
+		if ((sess->fe->options & PR_O_CONTSTATS) && (s->flags & SF_BE_ASSIGNED) && !(s->flags & SF_IGNORE))
 			stream_process_counters(s);
 
 		si_update_both(si_f, si_b);
@@ -2679,7 +2679,8 @@
 	}
 
 	s->logs.t_close = tv_ms_elapsed(&s->logs.tv_accept, &now);
-	stream_process_counters(s);
+	if (!(s->flags & SF_IGNORE))
+		stream_process_counters(s);
 
 	if (s->txn && s->txn->status) {
 		int n;