diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf040a8e4..1f0f52e78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,7 +37,7 @@ For changes to the BPDM Helm charts please consult the [changelog](charts/bpdm/C
 - BPDM Gate: Fixed logic for identifiers to retrieve only generic type on output business partner
 - BPDM Gate: Fixed construction logic for states and identifiers by enabling business partner type 
 - BPDM Pool: When processing golden record tasks the Pool now ignores isCatenaXMemberData field if it is set to null. ([#1069](https://github.com/eclipse-tractusx/bpdm/issues/1069))
-- BPDM Gate: Fixed gate output logic to provide only generic states for uncategorized states.  
+- BPDM Gate: Fixed gate output logic to provide states based on business partner type.  
 
 ## [6.1.0] - [2024-07-15]
 
diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerMappings.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerMappings.kt
index 75c2b8ef5..c25d649a7 100644
--- a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerMappings.kt
+++ b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerMappings.kt
@@ -70,7 +70,7 @@ class BusinessPartnerMappings {
                     .filter { it.businessPartnerTyp == when (addressType) {
                         AddressType.LegalAndSiteMainAddress, AddressType.LegalAddress -> BusinessPartnerType.LEGAL_ENTITY
                         AddressType.AdditionalAddress -> BusinessPartnerType.ADDRESS
-                        AddressType.SiteMainAddress -> return@let emptyList() // No identifiers for SiteMainAddress
+                        AddressType.SiteMainAddress -> BusinessPartnerType.SITE
                     } }
                     .map(::toStateDto)
             }?: emptyList(),