diff --git a/src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/EventLogFileHandler.java b/src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/EventLogFileHandler.java
index 851f09a6a..4b403d5f5 100644
--- a/src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/EventLogFileHandler.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/reader_writer_shared/EventLogFileHandler.java
@@ -174,8 +174,10 @@ private void readInternal(Path pathToFile, int bufferSize, EventDispatcher proce
     public void deleteAllFiles() {
         LOG.debug("Cleaning up any leftover files.");
         File root = new File(metricsLocation);
-        // Filter out '.tmp' files, we do not want to delete currBucket .tmp files
-        String[] filesToDelete = root.list((dir, name) -> !name.endsWith(TMP_FILE_EXT));
+        String[] filesToDelete = root.list();
+        if (filesToDelete == null) {
+            return;
+        }
         deleteFiles(Arrays.asList(filesToDelete));
     }