diff --git a/Marco.Pms.Services/Controllers/ImageController.cs b/Marco.Pms.Services/Controllers/ImageController.cs
index 7c54e9c..48fbc3b 100644
--- a/Marco.Pms.Services/Controllers/ImageController.cs
+++ b/Marco.Pms.Services/Controllers/ImageController.cs
@@ -203,6 +203,10 @@ namespace Marco.Pms.Services.Controllers
                 {
                     task = tasks.FirstOrDefault(t => t.Id == comment.TaskAllocationId);
                 }
+                if (task != null)
+                {
+                    comment = comments.OrderBy(c => c.CommentDate).FirstOrDefault(c => c.TaskAllocationId == task.Id);
+                }
 
                 var workItem = workItems.FirstOrDefault(w => w.Id == task?.WorkItemId);
                 var workArea = workAreas.FirstOrDefault(wa => wa.Id == workItem?.WorkAreaId);