diff --git a/Packet++/src/BgpLayer.cpp b/Packet++/src/BgpLayer.cpp
index 4e1269abcf..a237df9234 100644
--- a/Packet++/src/BgpLayer.cpp
+++ b/Packet++/src/BgpLayer.cpp
@@ -21,7 +21,10 @@ namespace pcpp
 		uint16_t messageLen = be16toh(getBasicHeader()->length);
 		if (m_DataLen < messageLen)
 		{
-			return m_DataLen;
+        if (m_DataLen < sizeof(bgp_common_header))
+        {
+            return m_DataLen;
+        }
 		}
 
 		return (size_t)messageLen;