diff --git a/gateway/gateway.go b/gateway/gateway.go
index 9c419b5a..7d72c632 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -312,11 +312,9 @@ func (gw *Gateway) handleMessage(msg config.Message, dest *bridge.Bridge) []*BrM
 			msg.Channel = originchannel
 		}
 
-		if canonicalParentMsgID != "" {
-			msg.ParentID =  gw.getDestMsgID(canonicalParentMsgID, dest, channel)
-			if msg.ParentID == "" {
-			   msg.ParentID = canonicalParentMsgID
-			}
+		msg.ParentID =  gw.getDestMsgID(canonicalParentMsgID, dest, channel)
+		if msg.ParentID == "" {
+		   msg.ParentID = canonicalParentMsgID
 		}
 
 		mID, err := dest.Send(msg)