diff --git a/engine/cdr.go b/engine/cdr.go
index 2e3f03b24..ea32da639 100644
--- a/engine/cdr.go
+++ b/engine/cdr.go
@@ -272,8 +272,8 @@ func (cdr *CDR) AsCDRsql() (cdrSQL *CDRsql) {
 	cdrSQL.Subject = cdr.Subject
 	cdrSQL.Destination = cdr.Destination
 	cdrSQL.SetupTime = cdr.SetupTime
-	if cdrSQL.AnswerTime != nil {
-		cdr.AnswerTime = *cdrSQL.AnswerTime
+	if !cdr.AnswerTime.IsZero() {
+		cdrSQL.AnswerTime = utils.TimePointer(cdr.AnswerTime)
 	}
 	cdrSQL.Usage = cdr.Usage.Nanoseconds()
 	cdrSQL.ExtraFields = utils.ToJSON(cdr.ExtraFields)
diff --git a/migrator/cdrs.go b/migrator/cdrs.go
index fec653eb3..d5e53dd2f 100644
--- a/migrator/cdrs.go
+++ b/migrator/cdrs.go
@@ -195,8 +195,8 @@ func NewV1CDRFromCDRSql(cdrSql *engine.CDRsql) (cdr *v1Cdrs, err error) {
 	cdr.Subject = cdrSql.Subject
 	cdr.Destination = cdrSql.Destination
 	cdr.SetupTime = cdrSql.SetupTime
-	if !cdr.AnswerTime.IsZero() {
-		cdrSql.AnswerTime = utils.TimePointer(cdr.AnswerTime)
+	if cdrSql.AnswerTime != nil {
+		cdr.AnswerTime = *cdrSql.AnswerTime
 	}
 	cdr.Usage = time.Duration(cdrSql.Usage)
 	cdr.CostSource = cdrSql.CostSource
@@ -225,8 +225,8 @@ func (cdr *v1Cdrs) AsCDRsql() (cdrSql *engine.CDRsql) {
 	cdrSql.Subject = cdr.Subject
 	cdrSql.Destination = cdr.Destination
 	cdrSql.SetupTime = cdr.SetupTime
-	if cdrSql.AnswerTime != nil {
-		cdr.AnswerTime = *cdrSql.AnswerTime
+	if !cdr.AnswerTime.IsZero() {
+		cdrSql.AnswerTime = utils.TimePointer(cdr.AnswerTime)
 	}
 	cdrSql.Usage = cdr.Usage.Nanoseconds()
 	cdrSql.ExtraFields = utils.ToJSON(cdr.ExtraFields)