diff --git a/agents/kamagent.go b/agents/kamagent.go
index 7ef0f9ede..49d0d1e44 100644
--- a/agents/kamagent.go
+++ b/agents/kamagent.go
@@ -252,7 +252,8 @@ func (ka *KamailioAgent) onDlgList(evData []byte, connIdx int) {
 	}
 	var sIDs []*sessions.SessionID
 	for _, dlgInfo := range kamDlgRpl.Jsonrpl_body.Result {
-		var originHost, originID string
+		originHost := ka.conns[connIdx].RemoteAddr().String()
+		originID := dlgInfo.CallId + ";" + dlgInfo.Caller.Tag
 		for _, variable := range dlgInfo.Variables {
 			if variable.CgrOriginHost != utils.EmptyString {
 				originHost = variable.CgrOriginHost
@@ -261,12 +262,6 @@ func (ka *KamailioAgent) onDlgList(evData []byte, connIdx int) {
 				originID = variable.CgrOriginID
 			}
 		}
-		if originHost == utils.EmptyString {
-			originHost = ka.conns[connIdx].RemoteAddr().String()
-		}
-		if originID == utils.EmptyString {
-			originID = dlgInfo.CallId + ";" + dlgInfo.Caller.Tag
-		}
 		sIDs = append(sIDs, &sessions.SessionID{
 			OriginHost: originHost,
 			OriginID:   originID,