diff --git a/internal/metricRouter/metricRouter.go b/internal/metricRouter/metricRouter.go
index 6087387..ea61416 100644
--- a/internal/metricRouter/metricRouter.go
+++ b/internal/metricRouter/metricRouter.go
@@ -180,7 +180,7 @@ func (r *metricRouter) Init(ticker mct.MultiChanTicker, wg *sync.WaitGroup, rout
 	}
 	r.mp.SetNormalizeUnits(r.config.NormalizeUnits)
 
-	err = r.mp.AddAddTagsByCondition("true", r.config.HostnameTagName, r.hostname)
+	err = r.mp.AddAddTagsByCondition("!msg.HasTag('"+r.config.HostnameTagName+"')", r.config.HostnameTagName, r.hostname)
 	if err != nil {
 		return fmt.Errorf("MessageProcessor AddAddTagsByCondition() failed: %w", err)
 	}