diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/Message.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/Message.java
index 39048b920e..7feb40419f 100644
--- a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/Message.java
+++ b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/Message.java
@@ -637,7 +637,7 @@ public void setMessageTemplate(MessageTemplate messageTemplate) {
     }
 
     public long getSortId() {
-        return sortId == 0 ? timeStamp == null ? 0 : timeStamp.getTime() : id;
+        return sortId != 0 ? sortId : timeStamp != null ? timeStamp.getTime() : id;
     }
 
     public void setSortId(long sortId) {