diff --git a/src/main/java/com/nhn/pinpoint/common/bo/SpanBo.java b/src/main/java/com/nhn/pinpoint/common/bo/SpanBo.java
index 9cbd78de1..e1209b3d2 100644
--- a/src/main/java/com/nhn/pinpoint/common/bo/SpanBo.java
+++ b/src/main/java/com/nhn/pinpoint/common/bo/SpanBo.java
@@ -381,10 +381,8 @@ public class SpanBo implements com.nhn.pinpoint.common.bo.Span {
             buffer.put(false);
         }
 
-        // 공간 절약을 위해서 flag는 무조껀 마지막에 넣어야 한다.
-        if (flag != 0) {
-            buffer.put(flag);
-        }
+        buffer.put(flag);
+
         return buffer.getBuffer();
     }
 
@@ -420,10 +418,8 @@ public class SpanBo implements com.nhn.pinpoint.common.bo.Span {
             this.exceptionMessage = buffer.readPrefixedString();
         }
 
-        // flag는 무조껀 마지막에 넣어야 한다.
-        if (buffer.limit() == 2) {
-            this.flag = buffer.readShort();
-        }
+        this.flag = buffer.readShort();
+
         return buffer.getOffset();
     }