diff --git a/engine/cdrs.go b/engine/cdrs.go
index ff75b336a..d0255b2d6 100644
--- a/engine/cdrs.go
+++ b/engine/cdrs.go
@@ -324,13 +324,13 @@ func (cdrS *CDRServer) processEvents(ctx *context.Context, evs []*utils.CGREvent
 		if err != nil {
 			return nil, fmt.Errorf("retrieving %s option failed: %w", utils.MetaRerate, err)
 		}
-		if err := cdrS.db.SetCDR(cgrEv, false); err != nil {
+		if err := cdrS.db.SetCDR(ctx, cgrEv, false); err != nil {
 			if err != utils.ErrExists || !rerate {
 
 				// ToDo: add refund logic
 				return nil, fmt.Errorf("storing CDR %s failed: %w", utils.ToJSON(cgrEv), err)
 			}
-			if err = cdrS.db.SetCDR(cgrEv, true); err != nil {
+			if err = cdrS.db.SetCDR(ctx, cgrEv, true); err != nil {
 				utils.Logger.Warning(
 					fmt.Sprintf("<%s> error: <%s> updating CDR %+v",
 						utils.CDRs, err.Error(), utils.ToJSON(cgrEv)))
diff --git a/engine/storage_interface.go b/engine/storage_interface.go
index 3da7cab61..5c3a2f149 100644
--- a/engine/storage_interface.go
+++ b/engine/storage_interface.go
@@ -108,7 +108,7 @@ type DataDBDriver interface {
 
 type StorDB interface {
 	Storage
-	SetCDR(*utils.CGREvent, bool) error
+	SetCDR(*context.Context, *utils.CGREvent, bool) error
 	GetCDRs(*context.Context, []*Filter, map[string]interface{}) ([]*CDR, error)
 	RemoveCDRs(*context.Context, []*Filter) error
 }
diff --git a/engine/storage_internal_stordb.go b/engine/storage_internal_stordb.go
index 392bfe69b..a5343cb6a 100644
--- a/engine/storage_internal_stordb.go
+++ b/engine/storage_internal_stordb.go
@@ -28,7 +28,7 @@ import (
 )
 
 // SetCDR for ManagerDB interface. SetCDR will set a single CDR in internal based on the CGREvent
-func (iDB *InternalDB) SetCDR(cgrEv *utils.CGREvent, allowUpdate bool) error {
+func (iDB *InternalDB) SetCDR(_ *context.Context, cgrEv *utils.CGREvent, allowUpdate bool) error {
 	uniqueID := utils.IfaceAsString(cgrEv.APIOpts[utils.MetaCDRID])
 	if !allowUpdate {
 		if _, has := iDB.db.Get(utils.MetaCDRs, uniqueID); has {
diff --git a/engine/storage_sql.go b/engine/storage_sql.go
index 3d23aadd6..12979fbf5 100644
--- a/engine/storage_sql.go
+++ b/engine/storage_sql.go
@@ -141,7 +141,7 @@ func (sqls *SQLStorage) RemoveVersions(vrs Versions) (err error) {
 	return
 }
 
-func (sqls *SQLStorage) SetCDR(cdr *utils.CGREvent, allowUpdate bool) error {
+func (sqls *SQLStorage) SetCDR(_ *context.Context, cdr *utils.CGREvent, allowUpdate bool) error {
 	tx := sqls.db.Begin()
 	if tx.Error != nil {
 		return tx.Error