diff --git a/src/FrontOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs b/src/FrontOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs
index 1079037..d1b9571 100644
--- a/src/FrontOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs
+++ b/src/FrontOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs
@@ -18,10 +18,13 @@ public class CommissionProfile : IRegister
             .Map(dest => dest.Status, src => src.Status);
 
         config.NewConfig<ProtoDto.GetMyWeeklyBalancesRequest, GetMyWeeklyBalancesQuery>()
-            .Map(dest => dest.PageNumber, src => src.PageNumber)
-            .Map(dest => dest.PageSize, src => src.PageSize)
-            .Map(dest => dest.WeekDefinitionId, src => src.WeekDefinitionId != null ? (long?)src.WeekDefinitionId.Value : null)
-            .Map(dest => dest.OnlyActive, src => src.OnlyActive);
+            .MapWith(src => new GetMyWeeklyBalancesQuery
+            {
+                PageNumber = src.PageNumber,
+                PageSize = src.PageSize,
+                WeekDefinitionId = src.WeekDefinitionId,
+                OnlyActive = src.OnlyActive
+            });
 
         // Response mappings
         config.NewConfig<GetMyCommissionPayoutsResponseDto, ProtoDto.GetMyCommissionPayoutsResponse>()