diff --git a/force-app/main/default/classes/ProgramEngagementSelector.cls b/force-app/main/default/classes/ProgramEngagementSelector.cls
index 8af383208..0ab9ccdfc 100755
--- a/force-app/main/default/classes/ProgramEngagementSelector.cls
+++ b/force-app/main/default/classes/ProgramEngagementSelector.cls
@@ -72,7 +72,8 @@ public with sharing class ProgramEngagementSelector {
     public List<ProgramEngagement__c> getProgramEngagementsByProgramId(
         Id programId,
         Set<String> fields,
-        Set<String> stages
+        Set<String> stages,
+        Integer engagementLimit
     ) {
         if (
             !(Schema.SObjectType.ProgramEngagement__c.isAccessible() &&
@@ -84,8 +85,8 @@ public with sharing class ProgramEngagementSelector {
             return new List<ProgramEngagement__c>();
         }
 
-        Integer limitTo =
-            System.Limits.getLimitQueryRows() - System.Limits.getQueryRows();
+        // Integer limitTo =
+        //     System.Limits.getLimitQueryRows() - System.Limits.getQueryRows();
 
         queryBuilder
             .reset()
@@ -95,7 +96,7 @@ public with sharing class ProgramEngagementSelector {
                 String.valueOf(ProgramEngagement__c.Program__c) + ' = :programId'
             )
             .addCondition(String.valueOf(ProgramEngagement__c.Stage__c) + ' IN :stages')
-            .withLimit(limitTo);
+            .withLimit(engagementLimit);
 
         List<ProgramEngagement__c> programEngagements = Database.query(
             queryBuilder.buildSoqlQuery()
diff --git a/force-app/main/default/classes/ServiceScheduleCreatorController.cls b/force-app/main/default/classes/ServiceScheduleCreatorController.cls
index ae57ce2ee..162fd1558 100644
--- a/force-app/main/default/classes/ServiceScheduleCreatorController.cls
+++ b/force-app/main/default/classes/ServiceScheduleCreatorController.cls
@@ -47,9 +47,9 @@ public with sharing class ServiceScheduleCreatorController {
     }
 
     @AuraEnabled(cacheable=true)
-    public static SelectParticipantModel getSelectParticipantModel(Id serviceId) {
+    public static SelectParticipantModel getSelectParticipantModel(Id serviceId, Integer engagementLimit) {
         try {
-            return service.getSelectParticipantModel(serviceId);
+            return service.getSelectParticipantModel(serviceId, engagementLimit);
         } catch (Exception ex) {
             throw Util.getAuraHandledException(ex);
         }
diff --git a/force-app/main/default/classes/ServiceScheduleService.cls b/force-app/main/default/classes/ServiceScheduleService.cls
index 0c7517f06..257f52b27 100644
--- a/force-app/main/default/classes/ServiceScheduleService.cls
+++ b/force-app/main/default/classes/ServiceScheduleService.cls
@@ -98,9 +98,9 @@ public with sharing class ServiceScheduleService {
         domain.insertParticipants(engagements, schedule);
     }
 
-    public SelectParticipantModel getSelectParticipantModel(Id serviceId) {
+    public SelectParticipantModel getSelectParticipantModel(Id serviceId, Integer engagementLimit) {
         SelectParticipantModel model = new SelectParticipantModel();
-        loadAndPopulateParticipantRecords(serviceId, model);
+        loadAndPopulateParticipantRecords(serviceId, model, engagementLimit);
         return model;
     }
 
@@ -248,7 +248,8 @@ public with sharing class ServiceScheduleService {
 
     private void loadAndPopulateParticipantRecords(
         Id serviceId,
-        SelectParticipantModel model
+        SelectParticipantModel model,
+        Integer engagementLimit
     ) {
         model.program = programEngagementSelector.getProgramByServiceId(serviceId);
         if (model.program == null) {
@@ -262,7 +263,8 @@ public with sharing class ServiceScheduleService {
         model.programEngagements = programEngagementSelector.getProgramEngagementsByProgramId(
             model.program.Id,
             getSelectFieldsWithToLabel(model),
-            progEngagementService.getActiveStages()
+            progEngagementService.getActiveStages(), 
+            engagementLimit
         );
     }
 
diff --git a/force-app/main/default/lwc/participantSelector/participantSelector.html b/force-app/main/default/lwc/participantSelector/participantSelector.html
index 2fb913c4c..d3f817a40 100644
--- a/force-app/main/default/lwc/participantSelector/participantSelector.html
+++ b/force-app/main/default/lwc/participantSelector/participantSelector.html
@@ -76,6 +76,16 @@
                                             onclick={handleSelectAll}
                                         ></lightning-button>
                                     </lightning-layout-item>
+                                    <lightning-layout-item
+                                        size="12"
+                                        class="slds-var-p-bottom_small"
+                                        if:true={showLimitInfo}
+                                    >
+                                        <c-scoped-notification
+                                            theme="info"
+                                            title={none}
+                                        ></c-scoped-notification>
+                                    </lightning-layout-item>
                                     <lightning-layout-item
                                         size="12"
                                         if:false={noRecordsFound}
diff --git a/force-app/main/default/lwc/participantSelector/participantSelector.js b/force-app/main/default/lwc/participantSelector/participantSelector.js
index 11879e113..4ead0a35f 100644
--- a/force-app/main/default/lwc/participantSelector/participantSelector.js
+++ b/force-app/main/default/lwc/participantSelector/participantSelector.js
@@ -39,6 +39,7 @@ import removeLabel from "@salesforce/label/c.Remove";
 
 const TIME = "TIME";
 const SEARCH_DELAY = 1000;
+const ENGAGEMENT_LIMIT = 1000;
 
 export default class ParticipantSelector extends LightningElement {
     @api serviceId;
@@ -69,6 +70,7 @@ export default class ParticipantSelector extends LightningElement {
     offsetRows = 50;
     offset = this.offsetRows;
     showSpinner = false;
+    showLimitInfo = false;
 
     _searchTimeout;
 
@@ -161,7 +163,7 @@ export default class ParticipantSelector extends LightningElement {
         return `${name} (${this.participantCount}/${this.capacity})`;
     }
 
-    @wire(getSelectParticipantModel, { serviceId: "$serviceId" })
+    @wire(getSelectParticipantModel, { serviceId: "$serviceId", engagementLimit: (ENGAGEMENT_LIMIT + 1)})
     dataSetup(result) {
         this.wiredData = result;
         if (!(result.data || result.error)) {
@@ -169,6 +171,7 @@ export default class ParticipantSelector extends LightningElement {
         }
 
         if (result.data) {
+            this.showLimitInfo = (result.data.programEngagements.length > ENGAGEMENT_LIMIT);
             this.loadTable(result.data);
             this.loadTableRows(result.data);
             this.loadPreviousSelections();
@@ -207,7 +210,7 @@ export default class ParticipantSelector extends LightningElement {
 
     loadTableRows(data) {
         let selectedIds = this.selectedEngagements.map(engagement => engagement.Id);
-        this.allEngagements = data.programEngagements.slice(0);
+        this.allEngagements = data.programEngagements.slice(0, ENGAGEMENT_LIMIT);
 
         this.availableEngagementRows = this.allEngagements
             .filter(engagement => !selectedIds.includes(engagement.Id))