diff --git a/source/extensions/upstreams/http/config.cc b/source/extensions/upstreams/http/config.cc
index 6d8a8090c7388..3ea556f1447db 100644
--- a/source/extensions/upstreams/http/config.cc
+++ b/source/extensions/upstreams/http/config.cc
@@ -55,6 +55,9 @@ ProtocolOptionsConfigImpl::parseFeatures(const envoy::config::cluster::v3::Clust
     if (options->use_downstream_protocol_) {
       features |= Upstream::ClusterInfo::Features::USE_DOWNSTREAM_PROTOCOL;
     }
+    if (options->use_alpn_) {
+      features |= Upstream::ClusterInfo::Features::USE_ALPN;
+    }
   } else {
     if (config.has_http2_protocol_options()) {
       features |= Upstream::ClusterInfo::Features::HTTP2;
@@ -67,9 +70,6 @@ ProtocolOptionsConfigImpl::parseFeatures(const envoy::config::cluster::v3::Clust
   if (config.close_connections_on_host_health_failure()) {
     features |= Upstream::ClusterInfo::Features::CLOSE_CONNECTIONS_ON_HOST_HEALTH_FAILURE;
   }
-  if (options->use_alpn_) {
-    features |= Upstream::ClusterInfo::Features::USE_ALPN;
-  }
   return features;
 }