diff --git a/.changelog/9872.txt b/.changelog/9872.txt
new file mode 100644
index 000000000..e128139c2
--- /dev/null
+++ b/.changelog/9872.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: Allow per-upstream configuration to be set in service-defaults. [experimental]
+```
\ No newline at end of file
diff --git a/agent/consul/config_endpoint.go b/agent/consul/config_endpoint.go
index 9869a93e5..49e3f7d50 100644
--- a/agent/consul/config_endpoint.go
+++ b/agent/consul/config_endpoint.go
@@ -330,7 +330,7 @@ func (c *ConfigEntry) ResolveServiceConfig(args *structs.ServiceConfigRequest, r
 		func(ws memdb.WatchSet, state *state.Store) error {
 			reply.Reset()
 			reply.MeshGateway.Mode = structs.MeshGatewayModeDefault
-
+			// TODO(freddy) Refactor this into smaller set of state store functions
 			// Pass the WatchSet to both the service and proxy config lookups. If either is updated during the
 			// blocking query, this function will be rerun and these state store lookups will both be current.
 			// We use the default enterprise meta to look up the global proxy defaults because they are not namespaced.