diff --git a/agent/proxycfg/connect_proxy.go b/agent/proxycfg/connect_proxy.go
index 54886335ec..80316615bf 100644
--- a/agent/proxycfg/connect_proxy.go
+++ b/agent/proxycfg/connect_proxy.go
@@ -98,7 +98,7 @@ func (s *handlerConnectProxy) initialize(ctx context.Context) (ConfigSnapshot, e
 			Name:           structs.MeshConfigMesh,
 			Datacenter:     s.source.Datacenter,
 			QueryOptions:   structs.QueryOptions{Token: s.token},
-			EnterpriseMeta: *s.proxyID.DefaultEnterpriseMetaForPartition(),
+			EnterpriseMeta: *structs.DefaultEnterpriseMetaInPartition(s.proxyID.PartitionOrDefault()),
 		}, meshConfigEntryID, s.ch)
 		if err != nil {
 			return snap, err
diff --git a/agent/structs/structs.go b/agent/structs/structs.go
index af87708fee..cb47bff63a 100644
--- a/agent/structs/structs.go
+++ b/agent/structs/structs.go
@@ -1506,7 +1506,7 @@ type HealthCheck struct {
 func (hc *HealthCheck) NodeIdentity() Identity {
 	return Identity{
 		ID:             hc.Node,
-		EnterpriseMeta: *hc.NodeEnterpriseMetaForPartition(),
+		EnterpriseMeta: *NodeEnterpriseMetaInPartition(hc.PartitionOrDefault()),
 	}
 }
 
diff --git a/agent/structs/structs_oss.go b/agent/structs/structs_oss.go
index 045617b503..8faecb1164 100644
--- a/agent/structs/structs_oss.go
+++ b/agent/structs/structs_oss.go
@@ -46,14 +46,6 @@ func (m *EnterpriseMeta) WildcardEnterpriseMetaForPartition() *EnterpriseMeta {
 	return &emptyEnterpriseMeta
 }
 
-func (m *EnterpriseMeta) DefaultEnterpriseMetaForPartition() *EnterpriseMeta {
-	return &emptyEnterpriseMeta
-}
-
-func (m *EnterpriseMeta) NodeEnterpriseMetaForPartition() *EnterpriseMeta {
-	return &emptyEnterpriseMeta
-}
-
 func (m *EnterpriseMeta) NewEnterpriseMetaInPartition(_ string) *EnterpriseMeta {
 	return &emptyEnterpriseMeta
 }