diff --git a/rollup/core/classes/Rollup.cls b/rollup/core/classes/Rollup.cls
index 624c5e78..a9e151b6 100644
--- a/rollup/core/classes/Rollup.cls
+++ b/rollup/core/classes/Rollup.cls
@@ -591,7 +591,7 @@ global without sharing virtual class Rollup implements RollupLogger.ToStringObje
   @AuraEnabled
   global static String getBatchRollupStatus(String jobId) {
     String jobStatus = [SELECT Status FROM AsyncApexJob WHERE Id = :jobId LIMIT 1]?.Status;
-    if ([SELECT COUNT() FROM RollupState__c WHERE RelatedJobId__c = :jobId] > 0) {
+    if ([SELECT COUNT() FROM RollupState__c WHERE RelatedJobId__c = :jobId LIMIT 1] > 0) {
       jobStatus = 'Processing';
     }
     return jobStatus;
diff --git a/rollup/core/classes/RollupFullRecalcProcessor.cls b/rollup/core/classes/RollupFullRecalcProcessor.cls
index dafee0ad..a64742d0 100644
--- a/rollup/core/classes/RollupFullRecalcProcessor.cls
+++ b/rollup/core/classes/RollupFullRecalcProcessor.cls
@@ -84,7 +84,6 @@ global abstract without sharing class RollupFullRecalcProcessor extends RollupAs
         conductor.finalizer.addCaboose(caboose);
       }
       if (this.isBatch()) {
-        // conductor.jobId = this.jobId;
         conductor.startAsyncWork();
       } else {
         this.finalizer.addCaboose(conductor);