diff --git a/main/channel.c b/main/channel.c
index fdcdc83d47..6d31bb19dd 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1345,6 +1345,11 @@ void ast_channel_free(struct ast_channel *chan)
 
 	/* Destroy the jitterbuffer */
 	ast_jb_destroy(chan);
+
+	if (chan->cdr) {
+		ast_cdr_free(chan->cdr);
+		chan->cdr = NULL;
+	}
 	
 	ast_mutex_destroy(&chan->lock_dont_use);
 
@@ -1657,6 +1662,7 @@ int ast_hangup(struct ast_channel *chan)
 			
 		ast_cdr_end(chan->cdr);
 		ast_cdr_detach(chan->cdr);
+		chan->cdr = NULL;
 	}
 	
 	ast_channel_free(chan);
diff --git a/main/pbx.c b/main/pbx.c
index 8846a9e720..5eb2550148 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -6972,6 +6972,7 @@ static int ast_pbx_outgoing_cdr_failed(void)
 	ast_cdr_end(chan->cdr);
 	ast_cdr_failed(chan->cdr);      /* set the status to failed */
 	ast_cdr_detach(chan->cdr);      /* post and free the record */
+	chan->cdr = NULL;
 	ast_channel_free(chan);         /* free the channel */
 
 	return 0;  /* success */