diff --git a/envoy b/envoy
index 0b10b055a6..94c4585079 160000
--- a/envoy
+++ b/envoy
@@ -1 +1 @@
-Subproject commit 0b10b055a6e1dbdd600f9a80f8b8d803bdd8ec9c
+Subproject commit 94c4585079212748721c9855a94f8f2f488f2cbf
diff --git a/envoy_build_config/BUILD b/envoy_build_config/BUILD
index d607016c78..2f020118a8 100644
--- a/envoy_build_config/BUILD
+++ b/envoy_build_config/BUILD
@@ -14,6 +14,7 @@ envoy_cc_library(
     deps = [
         "extension_registry_platform_additions",
         "@envoy//source/common/network:socket_lib",
+        "@envoy//source/common/router:upstream_codec_filter_lib",
         "@envoy//source/common/upstream:logical_dns_cluster_lib",
         "@envoy//source/extensions/clusters/dynamic_forward_proxy:cluster",
         "@envoy//source/extensions/compression/brotli/decompressor:config",
diff --git a/envoy_build_config/extension_registry.cc b/envoy_build_config/extension_registry.cc
index 7d03fe43e5..59183fc4ee 100644
--- a/envoy_build_config/extension_registry.cc
+++ b/envoy_build_config/extension_registry.cc
@@ -2,6 +2,7 @@
 
 #include "source/common/network/default_client_connection_factory.h"
 #include "source/common/network/socket_interface_impl.h"
+#include "source/common/router/upstream_codec_filter.h"
 #include "source/common/upstream/logical_dns_cluster.h"
 #include "source/extensions/clusters/dynamic_forward_proxy/cluster.h"
 #include "source/extensions/compression/brotli/decompressor/config.h"
@@ -62,6 +63,7 @@ void ExtensionRegistry::registerFactories() {
   Envoy::Extensions::Upstreams::Http::Generic::forceRegisterGenericGenericConnPoolFactory();
   Envoy::Upstream::forceRegisterLogicalDnsClusterFactory();
   ExtensionRegistryPlatformAdditions::registerFactories();
+  Router::forceRegisterUpstreamCodecFilterFactory();
 
   // TODO: add a "force initialize" function to the upstream code, or clean up the upstream code
   // in such a way that does not depend on the statically initialized variable.