diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c
index fad0828f2..6abcd38eb 100644
--- a/src/cfgparse-ssl.c
+++ b/src/cfgparse-ssl.c
@@ -1115,9 +1115,6 @@ static int bind_parse_alpn(char **args, int cur_arg, struct proxy *px, struct bi
 /* parse the "ssl" bind keyword */
 static int bind_parse_ssl(char **args, int cur_arg, struct proxy *px, struct bind_conf *conf, char **err)
 {
-	/* Do not change the xprt for QUIC. */
-	if (conf->xprt != xprt_get(XPRT_QUIC))
-		conf->xprt = &ssl_sock;
 	conf->options |= BC_O_USE_SSL;
 
 	if (global_ssl.listen_default_ciphers && !conf->ssl_conf.ciphers)
diff --git a/src/listener.c b/src/listener.c
index 3efe6c1c8..929c2387a 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -1656,6 +1656,9 @@ int bind_parse_args_list(struct bind_conf *bind_conf, char **args, int cur_arg,
 		goto out;
 #endif
 	}
+	else if (bind_conf->options & BC_O_USE_SSL) {
+		bind_conf->xprt = xprt_get(XPRT_SSL);
+	}
 
  out:
 	return err_code;