diff --git a/src/main/java/teammates/logic/api/LogsProcessor.java b/src/main/java/teammates/logic/api/LogsProcessor.java
index 57d889be488..66360e17be0 100644
--- a/src/main/java/teammates/logic/api/LogsProcessor.java
+++ b/src/main/java/teammates/logic/api/LogsProcessor.java
@@ -84,7 +84,7 @@ public int getNumberOfLogsForEvent(Instant startTime, Instant endTime, LogEvent
             QueryLogsResults logFetchResults = queryLogs(logsParams);
             List<GeneralLogEntry> logs = logFetchResults.getLogEntries();
             total += logs.size();
-            if (logFetchResults.getHasNextPage()) {
+            if (logFetchResults.getHasNextPage() && !logs.isEmpty()) {
                 logStartTime = logs.get(logs.size() - 1).getTimestamp();
             } else {
                 break;