diff --git a/packages/db/src/buffers/event-buffer-redis.ts b/packages/db/src/buffers/event-buffer-redis.ts
index 590c352e..6fb72c44 100644
--- a/packages/db/src/buffers/event-buffer-redis.ts
+++ b/packages/db/src/buffers/event-buffer-redis.ts
@@ -101,9 +101,11 @@ for i, sessionId in ipairs(sessionIds) do
     result[resultIndex] = { sessionId = sessionId, events = events }
     resultIndex = resultIndex + 1
     totalEvents = totalEvents + #events
-    if totalEvents >= batchSize then
-      break
-    end
+  end
+  
+  -- Only check if we should break AFTER processing the entire session
+  if totalEvents >= batchSize then
+    break
   end
 end