diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/StaticDataRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/StaticDataRepository.cs
index 0e0613030c..477bfc8630 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Repositories/StaticDataRepository.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/StaticDataRepository.cs
@@ -109,7 +109,7 @@ public IAsyncEnumerable<CompanyCertificateTypeData> GetCertificateTypes() =>
                 (
                     certificate.Id,
                     certificate.CompanyCertificateTypeDescriptions
-                    .Where(y => y.CompanyCertificateTypeId == certificate.Id)
+                    .Where(y => y.CompanyCertificateType.CompanyCertificateTypeAssignedStatus.CompanyCertificateTypeStatusId == CompanyCertificateTypeStatusId.ACTIVE)
                     .Select(x => new CertificateTypeDescription(x.LanguageShortName, x.Description))
                 ))
             .AsAsyncEnumerable();