diff --git a/src/sniffer.c b/src/sniffer.c
index 2bda75883..5a21f5431 100644
--- a/src/sniffer.c
+++ b/src/sniffer.c
@@ -6496,8 +6496,8 @@ doPart:
             return WOLFSSL_FATAL_ERROR;
     }
 
-    /* do we have another msg in record ? */
-    if (sslFrame < recordEnd) {
+    /* do we have another msg in record ? did we decode the current msg ? */
+    if (sslFrame < recordEnd && decoded) {
         Trace(ANOTHER_MSG_STR);
         goto doPart;
     }