diff --git a/apps/app_dial.c b/apps/app_dial.c
index 2465bfc1d6..2d5bf09382 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -765,25 +765,6 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
 		}
 		
 	}
-	if (peer && !ast_cdr_log_unanswered()) {
-		/* suppress the CDR's that didn't win */
-		struct dial_localuser *o;
-		for (o = outgoing; o; o = o->next) {
-			struct ast_channel *c = o->chan;
-			if (c && c != peer && c->cdr) {
-				ast_set_flag(c->cdr, AST_CDR_FLAG_POST_DISABLED);
-			}
-		}
-	} else if (!peer && !ast_cdr_log_unanswered()) {
-			/* suppress the CDR's that didn't win */
-		struct dial_localuser *o;
-		for (o = outgoing; o; o = o->next) {
-			struct ast_channel *c = o->chan;
-			if (c && c->cdr) {
-				ast_set_flag(c->cdr, AST_CDR_FLAG_POST_DISABLED);		
-			}
-		}
-	}
 	
 	return peer;
 }
diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h
index b88234a391..b61e250145 100644
--- a/include/asterisk/cdr.h
+++ b/include/asterisk/cdr.h
@@ -100,7 +100,6 @@ int ast_cdr_setvar(struct ast_cdr *cdr, const char *name, const char *value, int
 int ast_cdr_serialize_variables(struct ast_cdr *cdr, char *buf, size_t size, char delim, char sep, int recur);
 void ast_cdr_free_vars(struct ast_cdr *cdr, int recur);
 int ast_cdr_copy_vars(struct ast_cdr *to_cdr, struct ast_cdr *from_cdr);
-int ast_cdr_log_unanswered(void);
 
 typedef int (*ast_cdrbe)(struct ast_cdr *cdr);
 
diff --git a/main/cdr.c b/main/cdr.c
index ee0086444a..377ee09ace 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -103,11 +103,6 @@ AST_MUTEX_DEFINE_STATIC(cdr_pending_lock);
 static ast_cond_t cdr_pending_cond;
 
 
-int ast_cdr_log_unanswered(void)
-{
-	return unanswered;
-}
-
 /*! Register a CDR driver. Each registered CDR driver generates a CDR 
 	\return 0 on success, -1 on failure 
 */
@@ -986,6 +981,12 @@ static void post_cdr(struct ast_cdr *cdr)
 	struct ast_cdr_beitem *i;
 
 	for ( ; cdr ; cdr = cdr->next) {
+		if (!unanswered && cdr->disposition < AST_CDR_ANSWERED && (ast_strlen_zero(cdr->channel) || ast_strlen_zero(cdr->dstchannel))) {
+			/* For people, who don't want to see unanswered single-channel events */
+			ast_set_flag(cdr, AST_CDR_FLAG_POST_DISABLED);
+			continue;
+		}
+
 		chan = S_OR(cdr->channel, "<unknown>");
 		check_post(cdr);
 		if (ast_tvzero(cdr->end))