diff --git a/agents/kamevent.go b/agents/kamevent.go
index 539f40dd9..04d5524cd 100644
--- a/agents/kamevent.go
+++ b/agents/kamevent.go
@@ -44,8 +44,10 @@ const (
 	EvapiConnID            = "EvapiConnID" // used to share connID info in event for remote disconnects
 )
 
-var kamReservedFields = []string{EVENT, KamTRIndex, KamTRLabel,
-	KamHashEntry, KamHashID, KamCGRSubsystems}
+var (
+	kamReservedEventFields = []string{EVENT, KamTRIndex, KamTRLabel, KamCGRSubsystems}
+	kamReservedCDRFields   = append(kamReservedEventFields, KamHashEntry, KamHashID) // HashEntry and id are needed in events for disconnects
+)
 
 func NewKamSessionDisconnect(hEntry, hID, reason string) *KamSessionDisconnect {
 	return &KamSessionDisconnect{
@@ -118,7 +120,7 @@ func (kev KamEvent) AsMapStringInterface() (mp map[string]interface{}) {
 		if k == utils.Usage {
 			v += "s" // mark the Usage as seconds
 		}
-		if !utils.IsSliceMember(kamReservedFields, k) { // reserved attributes not getting into event
+		if !utils.IsSliceMember(kamReservedEventFields, k) { // reserved attributes not getting into event
 			mp[k] = v
 		}
 	}
@@ -131,7 +133,7 @@ func (kev KamEvent) AsCDR(timezone string) (cdr *engine.CDR) {
 	cdr.ExtraFields = make(map[string]string)
 	for fld, val := range kev { // first ExtraFields so we can overwrite
 		if !utils.IsSliceMember(utils.PrimaryCdrFields, fld) &&
-			!utils.IsSliceMember(kamReservedFields, fld) {
+			!utils.IsSliceMember(kamReservedCDRFields, fld) {
 			cdr.ExtraFields[fld] = val
 		}
 	}
diff --git a/sessions/smgbirpc_it_test.go b/sessions/smgbirpc_it_test.go
index a61d7e4d7..83cd25d17 100644
--- a/sessions/smgbirpc_it_test.go
+++ b/sessions/smgbirpc_it_test.go
@@ -81,7 +81,7 @@ func TestSMGBiRPCStartEngine(t *testing.T) {
 // Connect rpc client to rater
 func TestSMGBiRPCApierRpcConn(t *testing.T) {
 	time.Sleep(time.Duration(1 * time.Second))
-	clntHandlers := map[string]interface{}{"SMGClientV1.DisconnectSession": handleDisconnectSession}
+	clntHandlers := map[string]interface{}{"SessionSv1.DisconnectSession": handleDisconnectSession}
 	dummyClnt, err := utils.NewBiJSONrpcClient(smgBiRPCCfg.SessionSCfg().ListenBijson,
 		clntHandlers)
 	if err != nil { // First attempt is to make sure multiple clients are supported