diff --git a/engine/loader_it_test.go b/engine/loader_it_test.go
index 35dd4c6b0..e3d1b31d4 100755
--- a/engine/loader_it_test.go
+++ b/engine/loader_it_test.go
@@ -328,7 +328,7 @@ func TestLoaderITWriteToDatabase(t *testing.T) {
 		for _, st := range mpIDs {
 			rcv, err := loader.dataStorage.GetStatQueueProfile(st.Tenant, st.ID, true, utils.NonTransactional)
 			if err != nil {
-				t.Error("Failed GetStatsQueue: ", err.Error())
+				t.Errorf("Failed GetStatsQueue, tenant: %s, id: %s,  error: %s ", st.Tenant, st.ID, err.Error())
 			}
 			sts, err := APItoStats(st, "UTC")
 			if err != nil {
diff --git a/engine/storage_map.go b/engine/storage_map.go
index 9738e2463..ef6a0edf9 100755
--- a/engine/storage_map.go
+++ b/engine/storage_map.go
@@ -1510,14 +1510,14 @@ func (ms *MapStorage) GetStatQueueProfile(tenant string, id string,
 }
 
 // SetStatsQueue stores a StatsQueue into DataDB
-func (ms *MapStorage) SetStatQueueProfile(scf *StatQueueProfile) (err error) {
+func (ms *MapStorage) SetStatQueueProfile(sqp *StatQueueProfile) (err error) {
 	ms.mu.Lock()
 	defer ms.mu.Unlock()
-	result, err := ms.ms.Marshal(scf)
+	result, err := ms.ms.Marshal(sqp)
 	if err != nil {
 		return err
 	}
-	ms.dict[utils.StatQueueProfilePrefix+scf.ID] = result
+	ms.dict[utils.StatQueueProfilePrefix+utils.ConcatenatedKey(sqp.Tenant, sqp.ID)] = result
 	return
 }
 
diff --git a/engine/storage_redis.go b/engine/storage_redis.go
index 112dda68f..e39073ccd 100755
--- a/engine/storage_redis.go
+++ b/engine/storage_redis.go
@@ -1626,7 +1626,7 @@ func (rs *RedisStorage) SetStatQueueProfile(sq *StatQueueProfile) (err error) {
 	if err != nil {
 		return
 	}
-	return rs.Cmd("SET", utils.StatQueueProfilePrefix+sq.ID, result).Err
+	return rs.Cmd("SET", utils.StatQueueProfilePrefix+utils.ConcatenatedKey(sq.Tenant, sq.ID), result).Err
 }
 
 // RemStatsQueue removes a StatsQueue from dataDB