diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyRolesRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyRolesRepository.cs
index f0b663c2ef..cb14ebdd94 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyRolesRepository.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyRolesRepository.cs
@@ -65,7 +65,7 @@ public void RemoveCompanyAssignedRoles(Guid companyId, IEnumerable<CompanyRoleId
             .Where(companyRole => companyRole.CompanyRoleRegistrationData!.IsRegistrationRole && companyRoleIds.Contains(companyRole.Id))
             .Select(companyRole => new ValueTuple<CompanyRoleId, IEnumerable<AgreementStatusData>>(
                 companyRole.Id,
-                companyRole.AgreementAssignedCompanyRoles!
+                companyRole.AgreementAssignedCompanyRoles.Where(x => x.Agreement!.AgreementStatusId == AgreementStatusId.ACTIVE)
                     .Select(agreementAssignedCompanyRole => new AgreementStatusData(
                         agreementAssignedCompanyRole.AgreementId,
                         agreementAssignedCompanyRole.Agreement!.AgreementStatusId
diff --git a/src/registration/Registration.Service/Controllers/RegistrationController.cs b/src/registration/Registration.Service/Controllers/RegistrationController.cs
index 49e31955a9..93dd8ba678 100644
--- a/src/registration/Registration.Service/Controllers/RegistrationController.cs
+++ b/src/registration/Registration.Service/Controllers/RegistrationController.cs
@@ -250,7 +250,7 @@ public Task<CompanyDetailData> GetCompanyDetailDataAsync([FromRoute] Guid applic
         /// </summary>
         /// <param name="applicationId" example="4f0146c6-32aa-4bb1-b844-df7e8babdcb4">Id of the application to set the company for.</param>
         /// <param name="companyDetailData">The company with its address</param>
-        /// <remarks>Example: Post: /api/registration/application/4f0146c6-32aa-4bb1-b844-df7e8babdcb4/companyDetailsWithAddress</remarks>
+        /// <remarks>Example: Post: /api/registration/application/{applicationId}/companyDetailsWithAddress</remarks>
         /// <response code="200">Successfully set the company with its address</response>
         /// <response code="400">A request parameter was incorrect.</response>
         /// <response code="404">CompanyApplication was not found for the given id.</response>