diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WhatsAppParser.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WhatsAppParser.java
index f61f3454d0..7f2b987643 100644
--- a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WhatsAppParser.java
+++ b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WhatsAppParser.java
@@ -285,6 +285,9 @@ private void createReport(List<Chat> chatList, IItemSearcher searcher, WAContact
         int chatVirtualId = 0;
         HashMap<String, String> cache = new HashMap<>();
         for (Chat c : chatList) {
+            // sort messages before generating the report
+            Message.sort(c.getMessages());
+
             getAvatar(searcher, c.getRemote());
             searchMediaFilesForMessagesInBatches(c.getMessages(), searcher, handler, extractor, dbPath, context, null);
             int frag = 0;
@@ -735,11 +738,6 @@ public int compare(WhatsAppContext o1, WhatsAppContext o2) {
                 logger.info("Creating separate report for {}", DB.getPath()); //$NON-NLS-1$
             }
 
-            // sort messages
-            for (Chat chat : dbChatList) {
-                Message.sort(chat.getMessages());
-            }
-
             // create report for main dbs and backups which main db was not found
             createReport(dbChatList, searcher, contacts, handler, extractor, account, tmpDB, context);