diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index f360899fdd8e578d03db781e21464406b12011df..ee85f13dfa64f22d988c227b2f201ef8d4a6f8e4 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -5218,6 +5218,9 @@ static int dahdi_hangup(struct ast_channel *ast)
 		revert_fax_buffers(p, ast);
 
 		goto hangup_out;
+	} else {
+		p->cid_num[0] = '\0';
+		p->cid_name[0] = '\0';
 	}
 
 	ast_mutex_lock(&p->lock);
@@ -11285,10 +11288,15 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
 		ast_copy_string(tmp->mohinterpret, conf->chan.mohinterpret, sizeof(tmp->mohinterpret));
 		ast_copy_string(tmp->mohsuggest, conf->chan.mohsuggest, sizeof(tmp->mohsuggest));
 		ast_copy_string(tmp->context, conf->chan.context, sizeof(tmp->context));
-		ast_copy_string(tmp->cid_num, conf->chan.cid_num, sizeof(tmp->cid_num));
 		ast_copy_string(tmp->parkinglot, conf->chan.parkinglot, sizeof(tmp->parkinglot));
 		tmp->cid_ton = 0;
-		ast_copy_string(tmp->cid_name, conf->chan.cid_name, sizeof(tmp->cid_name));
+		if (analog_lib_handles(p->sig, p->radio, p->oprmode))
+			ast_copy_string(tmp->cid_num, conf->chan.cid_num, sizeof(tmp->cid_num));
+			ast_copy_string(tmp->cid_name, conf->chan.cid_name, sizeof(tmp->cid_name));
+		} else {
+			tmp->cid_num[0] = '\0';
+			tmp->cid_name[0] = '\0';
+		}
 		ast_copy_string(tmp->mailbox, conf->chan.mailbox, sizeof(tmp->mailbox));
 		if (channel != CHAN_PSEUDO && !ast_strlen_zero(tmp->mailbox)) {
 			char *mailbox, *context;
diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index 8f05e92c1478eb72fb64ed6b508a55ef1f71c641..48a55f99250a73497f68fab789b2a2cf87b4cd02 100644
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -2410,6 +2410,8 @@ int sig_pri_hangup(struct sig_pri_chan *p, struct ast_channel *ast)
 	p->progress = 0;
 	p->alerting = 0;
 	p->setup_ack = 0;
+	p->cid_num[0] = '\0';
+	p->cid_name[0] = '\0';
 	p->exten[0] = '\0';
 	sig_pri_set_dialing(p, 0);