diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
index b1a7fb0da..b1a13b545 100644
--- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
@@ -2965,6 +2965,8 @@ namespace IRaCIS.Application.Services
                            if (result.Count == maxStudyCount)
                            {
                                response.Status = DicomStatus.Cancel;
+
+                               return;
                            }
 
                            var studyTime = response.Dataset.GetDateTime(DicomTag.StudyDate, DicomTag.StudyTime);
@@ -2992,6 +2994,13 @@ namespace IRaCIS.Application.Services
                                StudyDescription = response.Dataset?.GetSingleValueOrDefault<string>(DicomTag.StudyDescription, ""),
                                StudyInstanceUID = response.Dataset?.GetSingleValueOrDefault<string>(DicomTag.StudyInstanceUID, "")
                            });
+
+                           if (result.Count == maxStudyCount)
+                           {
+                               response.Status = DicomStatus.Cancel;
+
+                               return;
+                           }
                        }
 
 
@@ -3006,8 +3015,6 @@ namespace IRaCIS.Application.Services
 
                 requestModalityList = requestModalityList.Count == 0 ? new List<string>() { "" } : requestModalityList;
 
-                requestModalityList = new List<string>() { "" };
-
                 var requestList = new List<DicomCFindRequest>();
                 foreach (var modality in requestModalityList)
                 {