diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs
index c3f48bfa..aee31370 100644
--- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs
+++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs
@@ -75,14 +75,14 @@ public class ProjectSetTimeDetailsQueryHandler
                             CreationDate = x.CreationDate.ToFarsi()
                         }).OrderBy(x => x.CreationDate).ToList() ?? [],
                     InitCreationTime = section?.CreationDate.ToFarsi() ?? "",
-                    SkillName = skill?.Name ?? "",
+                    SkillName = skill.Name ?? "",
                     UserFullName = user?.FullName ?? "",
                     SectionId = section?.Id ?? Guid.Empty,
                     InitialDescription = section?.InitialDescription ?? "",
                     InitialHours = (int)(section?.InitialEstimatedHours.TotalHours ?? 0),
                     InitialMinutes = section?.InitialEstimatedHours.Minutes ?? 0,
                     UserId = section?.OriginalAssignedUserId ?? 0,
-                    SkillId = task.Id,
+                    SkillId = skill.Id,
                 };
             }).OrderBy(x => x.SkillId).ToList(),
             task.Id,