diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java
index 0d9ab2beb..233a13438 100644
--- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java
+++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java
@@ -69,9 +69,8 @@ public class ReferenceDecorator implements StandardBuilder {
     public void setEntryServiceId(int value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            referenceBuilder.setEntryServiceId(value);
         }
+        referenceBuilder.setEntryServiceId(value);
     }
 
     public String getEntryServiceName() {
@@ -85,9 +84,8 @@ public class ReferenceDecorator implements StandardBuilder {
     public void setEntryServiceName(String value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            referenceBuilder.setEntryServiceName(value);
         }
+        referenceBuilder.setEntryServiceName(value);
     }
 
     public int getEntryApplicationInstanceId() {
@@ -117,9 +115,8 @@ public class ReferenceDecorator implements StandardBuilder {
     public void setParentServiceId(int value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            referenceBuilder.setParentServiceId(value);
         }
+        referenceBuilder.setParentServiceId(value);
     }
 
     public int getParentSpanId() {
@@ -141,9 +138,8 @@ public class ReferenceDecorator implements StandardBuilder {
     public void setParentServiceName(String value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            referenceBuilder.setParentServiceName(value);
         }
+        referenceBuilder.setParentServiceName(value);
     }
 
     public UniqueId getParentTraceSegmentId() {
@@ -165,9 +161,8 @@ public class ReferenceDecorator implements StandardBuilder {
     public void setNetworkAddressId(int value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            referenceBuilder.setNetworkAddressId(value);
         }
+        referenceBuilder.setNetworkAddressId(value);
     }
 
     public String getNetworkAddress() {
@@ -181,9 +176,8 @@ public class ReferenceDecorator implements StandardBuilder {
     public void setNetworkAddress(String value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            referenceBuilder.setNetworkAddress(value);
         }
+        referenceBuilder.setNetworkAddress(value);
     }
 
     @Override public void toBuilder() {
diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java
index 46d47fb39..caeeb146d 100644
--- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java
+++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java
@@ -133,9 +133,8 @@ public class SpanDecorator implements StandardBuilder {
     public void setPeerId(int peerId) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            spanBuilder.setPeerId(peerId);
         }
+        spanBuilder.setPeerId(peerId);
     }
 
     public String getPeer() {
@@ -149,9 +148,8 @@ public class SpanDecorator implements StandardBuilder {
     public void setPeer(String peer) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            spanBuilder.setPeer(peer);
         }
+        spanBuilder.setPeer(peer);
     }
 
     public int getOperationNameId() {
@@ -165,9 +163,8 @@ public class SpanDecorator implements StandardBuilder {
     public void setOperationNameId(int value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            spanBuilder.setOperationNameId(value);
         }
+        spanBuilder.setOperationNameId(value);
     }
 
     public String getOperationName() {
@@ -181,9 +178,8 @@ public class SpanDecorator implements StandardBuilder {
     public void setOperationName(String value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            spanBuilder.setOperationName(value);
         }
+        spanBuilder.setOperationName(value);
     }
 
     public boolean getIsError() {