diff --git a/iceoryx_posh/include/iceoryx_posh/internal/gateway/gateway_generic.inl b/iceoryx_posh/include/iceoryx_posh/internal/gateway/gateway_generic.inl
index dd46069..2ad9d4c 100644
--- a/iceoryx_posh/include/iceoryx_posh/internal/gateway/gateway_generic.inl
+++ b/iceoryx_posh/include/iceoryx_posh/internal/gateway/gateway_generic.inl
@@ -98,7 +98,7 @@ GatewayGeneric<channel_t, gateway_t>::addChannel(const capro::ServiceDescription
         auto result = channel_t::create({service.getServiceIDString(),
                                          service.getInstanceIDString(),
                                          service.getEventIDString(),
-                                         {0U, 0U, 0U, 0U},
+                                         service.getClassHash(),
                                          this->getInterface()},
                                         options);
         if (result.has_error())
diff --git a/iceoryx_posh/source/capro/service_description.cpp b/iceoryx_posh/source/capro/service_description.cpp
index c4b915d..9d1762b 100644
--- a/iceoryx_posh/source/capro/service_description.cpp
+++ b/iceoryx_posh/source/capro/service_description.cpp
@@ -105,6 +105,12 @@ bool ServiceDescription::operator==(const ServiceDescription& rhs) const noexcep
     {
         return false;
     }
+
+    if (m_classHash != rhs.m_classHash)
+    {
+        return false;
+    }
+
     return true;
 }