diff --git a/.changelog/16651.txt b/.changelog/16651.txt
new file mode 100644
index 00000000000..c297cca489d
--- /dev/null
+++ b/.changelog/16651.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+gateway: **(Enterprise only)** Fix bug where namespace/partition would fail to unmarshal.
+```
diff --git a/agent/structs/config_entry_routes.go b/agent/structs/config_entry_routes.go
index 1235723f89f..683ec9f3fac 100644
--- a/agent/structs/config_entry_routes.go
+++ b/agent/structs/config_entry_routes.go
@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/consul/acl"
 	"github.com/miekg/dns"
+
+	"github.com/hashicorp/consul/acl"
 )
 
 // BoundRoute indicates a route that has parent gateways which
@@ -443,7 +444,7 @@ type HTTPService struct {
 	// to routing it to the upstream service
 	Filters HTTPFilters
 
-	acl.EnterpriseMeta
+	acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"`
 }
 
 func (s HTTPService) ServiceName() ServiceName {
diff --git a/agent/structs/config_entry_status.go b/agent/structs/config_entry_status.go
index 85140f3e5aa..2a56ba08a01 100644
--- a/agent/structs/config_entry_status.go
+++ b/agent/structs/config_entry_status.go
@@ -22,7 +22,7 @@ type ResourceReference struct {
 	// unused, this should be blank.
 	SectionName string
 
-	acl.EnterpriseMeta
+	acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"`
 }
 
 func (r *ResourceReference) String() string {