diff --git a/agents/agentreq.go b/agents/agentreq.go
index 411a2afd4..d043672af 100644
--- a/agents/agentreq.go
+++ b/agents/agentreq.go
@@ -54,6 +54,7 @@ func NewAgentRequest(req utils.DataProvider,
 	}
 	ar = &AgentRequest{
 		Request:    req,
+		Tenant:     dfltTenant,
 		Vars:       vars,
 		CGRRequest: utils.NewOrderedNavigableMap(),
 		diamreq:    utils.NewOrderedNavigableMap(), // special case when CGRateS is building the request
@@ -65,13 +66,12 @@ func NewAgentRequest(req utils.DataProvider,
 		Trailer:    trailer,
 		Opts:       opts,
 	}
-	// populate tenant
-	if tntIf, err := ar.ParseField(
-		&config.FCTemplate{Type: utils.META_COMPOSED,
-			Value: tntTpl}); err == nil && tntIf.(string) != "" {
-		ar.Tenant = tntIf.(string)
-	} else {
-		ar.Tenant = dfltTenant
+	if tntTpl != nil {
+		if tntIf, err := ar.ParseField(
+			&config.FCTemplate{Type: utils.META_COMPOSED,
+				Value: tntTpl}); err == nil && tntIf.(string) != "" {
+			ar.Tenant = tntIf.(string)
+		}
 	}
 	ar.Vars.Set(utils.PathItems{{Field: utils.NodeID}}, utils.NewNMData(config.CgrConfig().GeneralCfg().NodeID))
 	return
diff --git a/ees/eereq.go b/ees/eereq.go
index 949207307..273731a99 100644
--- a/ees/eereq.go
+++ b/ees/eereq.go
@@ -37,6 +37,7 @@ func NewEventExporterRequest(req utils.DataProvider, dc, opts utils.MapStorage,
 	filterS *engine.FilterS) (eeR *EventExporterRequest) {
 	eeR = &EventExporterRequest{
 		req:     req,
+		tnt:     dfltTenant,
 		tmz:     timezone,
 		filterS: filterS,
 		cnt:     utils.NewOrderedNavigableMap(),
@@ -45,13 +46,12 @@ func NewEventExporterRequest(req utils.DataProvider, dc, opts utils.MapStorage,
 		dc:      dc,
 		opts:    opts,
 	}
-	// populate tenant
-	if tntIf, err := eeR.ParseField(
-		&config.FCTemplate{Type: utils.META_COMPOSED,
-			Value: tntTpl}); err == nil && tntIf.(string) != "" {
-		eeR.tnt = tntIf.(string)
-	} else {
-		eeR.tnt = dfltTenant
+	if tntTpl != nil {
+		if tntIf, err := eeR.ParseField(
+			&config.FCTemplate{Type: utils.META_COMPOSED,
+				Value: tntTpl}); err == nil && tntIf.(string) != "" {
+			eeR.tnt = tntIf.(string)
+		}
 	}
 	return
 }