diff --git a/src/core/common/message.cpp b/src/core/common/message.cpp
index 670c5d800..544ad6aab 100644
--- a/src/core/common/message.cpp
+++ b/src/core/common/message.cpp
@@ -224,7 +224,7 @@ uint8_t Message::GetBufferCount(void) const
 {
     uint8_t rval = 1;
 
-    for (const Buffer *curBuffer = GetNextBuffer(); curBuffer; curBuffer->GetNextBuffer())
+    for (const Buffer *curBuffer = GetNextBuffer(); curBuffer; curBuffer = curBuffer->GetNextBuffer())
     {
         rval++;
     }