diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/SendMessage/SendMessageCommand.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/SendMessage/SendMessageCommand.cs
index a086b83f..891a60fc 100644
--- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/SendMessage/SendMessageCommand.cs
+++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/SendMessage/SendMessageCommand.cs
@@ -131,14 +131,10 @@ public class SendMessageCommandHandler : IBaseCommandHandler<SendMessageCommand,
             taskId: request.TaskId,
             senderUserId: currentUserId,
             messageType: request.MessageType,
-            textContent: request.TextContent
+            textContent: request.TextContent,
+            uploadedFileId
         );
 
-        if (uploadedFileId.HasValue)
-        {
-            message.SetFile(uploadedFileId.Value);
-        }
-
         if (request.ReplyToMessageId.HasValue)
         {
             message.SetReplyTo(request.ReplyToMessageId.Value);
diff --git a/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/TaskChatAgg/Entities/TaskChatMessage.cs b/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/TaskChatAgg/Entities/TaskChatMessage.cs
index 841853cb..f82435be 100644
--- a/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/TaskChatAgg/Entities/TaskChatMessage.cs
+++ b/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/TaskChatAgg/Entities/TaskChatMessage.cs
@@ -16,7 +16,8 @@ public class TaskChatMessage : EntityBase<Guid>
     {
     }
 
-    public TaskChatMessage(Guid taskId, long senderUserId, MessageType messageType, string? textContent = null)
+    public TaskChatMessage(Guid taskId, long senderUserId, MessageType messageType,
+        string? textContent = null,Guid? fileId = null)
     {
         TaskId = taskId;
         SenderUserId = senderUserId;
@@ -25,7 +26,10 @@ public class TaskChatMessage : EntityBase<Guid>
         IsEdited = false;
         IsDeleted = false;
         IsPinned = false;
-
+        if (fileId.HasValue)
+        {
+            SetFile(fileId.Value);
+        }
         ValidateMessage();
         AddDomainEvent(new TaskChatMessageSentEvent(Id, taskId, senderUserId, messageType));
     }