Index: channels/sig_analog.c
===================================================================
--- channels/sig_analog.c	(revision 294045)
+++ channels/sig_analog.c	(working copy)
@@ -359,14 +359,16 @@
 
 static int analog_send_callerid(struct analog_pvt *p, int cwcid, struct ast_party_caller *caller)
 {
+	if (cwcid) {
+		p->callwaitcas = 0;
+	} else if (!p->use_callerid) {
+		return 0;
+	}
+
 	ast_debug(1, "Sending callerid.  CID_NAME: '%s' CID_NUM: '%s'\n",
 		caller->id.name.str,
 		caller->id.number.str);
 
-	if (cwcid) {
-		p->callwaitcas = 0;
-	}
-
 	if (p->calls->send_callerid) {
 		return p->calls->send_callerid(p->chan_pvt, cwcid, caller);
 	}