diff --git a/src/mux_h1.c b/src/mux_h1.c
index f9048b1..b1eebf1 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -1184,7 +1184,9 @@
 
 	TRACE_ENTER(H1_EV_RX_DATA|H1_EV_RX_HDRS, h1s->h1c->conn, h1s,, (size_t[]){max});
 
-	if (!(h1s->flags & H1S_F_NOT_FIRST) && !(h1m->flags & H1_MF_RESP)) {
+	if (!(h1s->h1c->px->options2 & PR_O2_NO_H2_UPGRADE) && /* H2 upgrade supported by the proxy */
+	    !(h1s->flags & H1S_F_NOT_FIRST) &&                 /* It is the first transaction */
+	    !(h1m->flags & H1_MF_RESP)) {                      /* It is a request */
 		/* Try to match H2 preface before parsing the request headers. */
 		ret = b_isteq(buf, 0, b_data(buf), ist(H2_CONN_PREFACE));
 		if (ret > 0) {
diff --git a/src/proxy.c b/src/proxy.c
index 2614325..d5dee5d 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -113,6 +113,7 @@
 
 	{"h1-case-adjust-bogus-client",   PR_O2_H1_ADJ_BUGCLI, PR_CAP_FE, 0, PR_MODE_HTTP },
 	{"h1-case-adjust-bogus-server",   PR_O2_H1_ADJ_BUGSRV, PR_CAP_BE, 0, PR_MODE_HTTP },
+	{"disable-h2-upgrade",            PR_O2_NO_H2_UPGRADE, PR_CAP_FE, 0, PR_MODE_HTTP },
 	{ NULL, 0, 0, 0 }
 };