diff --git a/libs/openzap/src/zap_isdn.c b/libs/openzap/src/zap_isdn.c
index 4b0d7a1f77..da164328a6 100644
--- a/libs/openzap/src/zap_isdn.c
+++ b/libs/openzap/src/zap_isdn.c
@@ -70,17 +70,11 @@ static L3INT zap_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 	int chan_id = 0;
 	zap_channel_t *zchan = NULL;
 	
-	if (Q931IsIEPresent(gen->ChanID)) {
-		Q931ie_ChanID *chanid = Q931GetIEPtr(gen->ChanID, gen->buf);
-		chan_id = chanid->ChanSlot;
-		zchan = &span->channels[chan_id];
+	if (gen->CRVFlag) {
+		zchan = span->channels_local_crv[gen->CRV];
 	} else {
-		if (gen->CRVFlag) {
-			zchan = span->channels_local_crv[gen->CRV];
-		} else {
-			zchan = span->channels_remote_crv[gen->CRV];
-		}
-	}   
+		zchan = span->channels_remote_crv[gen->CRV];
+	}
 
 	assert(span != NULL);
 	assert(isdn_data != NULL);