diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/buffer_v1.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/buffer_v1.go
index e58d5ad9c93..0a6b664989f 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/buffer_v1.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/buffer_v1.go
@@ -218,7 +218,7 @@ func (b *logBuffer) dequeue(start int64, capacity int, minimumDequeue bool) ([]B
 		// update the buffer with how many logs we have dequeued for this window
 		q.dequeued[start] += len(logs)
 	}
-	b.lggr.Debugw("minimum commitment logs dequeued", "start", start, "end", end, "numUpkeeps", len(b.queues), "minimumDequeueMet", minimumDequeueMet)
+	b.lggr.Debugw("minimum commitment logs dequeued", "start", start, "end", end, "numUpkeeps", len(b.queues), "numUpkeepIDs", len(b.queueIDs), "minimumDequeueMet", minimumDequeueMet, "logLimit", logLimit)
 	return result, remainingLogs
 }
 
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider.go
index 69a4a16109b..62e8ebfe41e 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider.go
@@ -254,6 +254,7 @@ func (p *logEventProvider) minimumCommitmentDequeue(latestBlock, start int64) []
 	var payloads []ocr2keepers.UpkeepPayload
 
 	blockRate := int(p.opts.BlockRate)
+	logLimit := int(p.opts.LogLimit)
 
 	for len(payloads) < MaxPayloads && start <= latestBlock {
 		startWindow, _ := getBlockWindow(start, blockRate)
@@ -261,7 +262,7 @@ func (p *logEventProvider) minimumCommitmentDequeue(latestBlock, start int64) []
 		// dequeue the minimum number logs (log limit, varies by chain) per upkeep for this block window
 		logs, remaining := p.buffer.Dequeue(startWindow, MaxPayloads-len(payloads), true)
 		if len(logs) > 0 {
-			p.lggr.Debugw("minimum commitment dequeue", "start", start, "latestBlock", latestBlock, "logs", len(logs), "remaining", remaining)
+			p.lggr.Debugw("minimum commitment dequeue", "start", start, "latestBlock", latestBlock, "logs", len(logs), "remaining", remaining, "blockRate", blockRate, "logLimit", logLimit)
 		}
 		for _, l := range logs {
 			payload, err := p.createPayload(l.ID, l.Log)
diff --git a/integration-tests/load/automationv2_1/automationv2_1_test.go b/integration-tests/load/automationv2_1/automationv2_1_test.go
index e78542f04f6..5cc5ac81179 100644
--- a/integration-tests/load/automationv2_1/automationv2_1_test.go
+++ b/integration-tests/load/automationv2_1/automationv2_1_test.go
@@ -649,7 +649,9 @@ Load Config:
 			upkeepDelaysRecovery = append(upkeepDelaysRecovery, delayRecovery)
 		}
 
-		blockWindowCounts[i] = upkeepMap
+		if len(upkeepMap) > 0 {
+			blockWindowCounts[i] = upkeepMap
+		}
 	}
 
 	for _, triggerContract := range triggerContracts {