diff --git a/src/administration/Administration.Service/BusinessLogic/CompanyDataBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/CompanyDataBusinessLogic.cs
index 5a2003863b..1b4dbbfd5f 100644
--- a/src/administration/Administration.Service/BusinessLogic/CompanyDataBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/CompanyDataBusinessLogic.cs
@@ -363,7 +363,7 @@ private async Task HandleCompanyCertificateCreationAsync(CompanyCertificateTypeI
                 x.DocumentStatusId = DocumentStatusId.PENDING;
             });
 
-        var companyCertificate = companyCertificateRepository.CreateCompanyCertificateData(_identityData.CompanyId, companyCertificateTypeId, doc.Id, expiryDate);
+        var companyCertificate = companyCertificateRepository.CreateCompanyCertificateData(_identityData.CompanyId, companyCertificateTypeId, doc.Id, (!expiryDate.HasValue) ? expiryDate : expiryDate.Value.UtcDateTime);
 
         await _portalRepositories.SaveAsync().ConfigureAwait(false);
     }
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyCertificateRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyCertificateRepository.cs
index 4f9a1fa639..9355065398 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyCertificateRepository.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyCertificateRepository.cs
@@ -53,7 +53,7 @@ public Task<bool> CheckCompanyCertificateId(Guid id) =>
     /// <inheritdoc />
     public CompanyCertificate CreateCompanyCertificateData(Guid companyId, CompanyCertificateTypeId companyCertificateTypeId, Guid docId, DateTimeOffset? expiryDate, Action<CompanyCertificate>? setOptionalFields)
     {
-        var companyCertificate = new CompanyCertificate(Guid.NewGuid(), DateTimeOffset.UtcNow, companyCertificateTypeId, CompanyCertificateStatusId.ACTIVE, companyId, docId);
+        var companyCertificate = new CompanyCertificate(Guid.NewGuid(), DateTimeOffset.UtcNow, companyCertificateTypeId, CompanyCertificateStatusId.ACTIVE, companyId, docId, expiryDate);
         setOptionalFields?.Invoke(companyCertificate);
         return _context.CompanyCertificates.Add(companyCertificate).Entity;
     }
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyCertificate.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyCertificate.cs
index 622c19ad02..58f6578dd7 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyCertificate.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/CompanyCertificate.cs
@@ -27,7 +27,7 @@ public class CompanyCertificate
 {
     private CompanyCertificate() { }
 
-    public CompanyCertificate(Guid id, DateTimeOffset validFrom, CompanyCertificateTypeId companyCertificateTypeId, CompanyCertificateStatusId companyCertificateStatusId, Guid companyId, Guid documentId) : this()
+    public CompanyCertificate(Guid id, DateTimeOffset validFrom, CompanyCertificateTypeId companyCertificateTypeId, CompanyCertificateStatusId companyCertificateStatusId, Guid companyId, Guid documentId, DateTimeOffset? validTill) : this()
     {
         Id = id;
         ValidFrom = validFrom;
@@ -35,6 +35,7 @@ public CompanyCertificate(Guid id, DateTimeOffset validFrom, CompanyCertificateT
         CompanyCertificateStatusId = companyCertificateStatusId;
         CompanyId = companyId;
         DocumentId = documentId;
+        ValidTill = validTill;
     }
 
     public Guid Id { get; private set; }
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs
index 98876d603c..1b69e62b5e 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs
@@ -1020,7 +1020,7 @@ public async Task CheckCompanyCertificate_WithValidCall_CreatesExpected()
         A.CallTo(() => _companyCertificateRepository.CreateCompanyCertificateData(_identity.CompanyId, CompanyCertificateTypeId.IATF, A<Guid>._, expiryDate, A<Action<CompanyCertificate>>._))
             .Invokes((Guid companyId, CompanyCertificateTypeId companyCertificateTypeId, Guid docId, DateTimeOffset? expiryDate, Action<CompanyCertificate>? setOptionalFields) =>
             {
-                var companyCertificateData = new CompanyCertificate(Guid.NewGuid(), DateTime.UtcNow, companyCertificateTypeId, CompanyCertificateStatusId.ACTIVE, companyId, docId);
+                var companyCertificateData = new CompanyCertificate(Guid.NewGuid(), DateTime.UtcNow, companyCertificateTypeId, CompanyCertificateStatusId.ACTIVE, companyId, docId, expiryDate);
                 setOptionalFields?.Invoke(companyCertificateData);
                 companyCertificates.Add(companyCertificateData);
             });