diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index bf4b89716..2ae8d7279 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -159,7 +159,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             if (inQuery.IsImageSegmentLabel == true)
             {
-                var querySV = _subjectVisitRepository.Where(t => t.Id == inQuery.SubjectVisitId)
+                var querySV = _subjectVisitRepository.WhereIf(inQuery.SubjectVisitId != null, t => t.Id == inQuery.SubjectVisitId)
                 .WhereIf(inQuery.SubjectId != null, t => t.SubjectId == inQuery.SubjectId)
                .Select(u => new SubjectVisitMarkUploadDto()
                {