diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 2022f901fe..6a4524921b 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9225,7 +9225,8 @@ static struct sip_pvt *find_call(struct sip_request *req, struct ast_sockaddr *a
 		}
 	}
 
-	if (!sip_cfg.pedanticsipchecking) {
+	/* match on callid only for REGISTERs */
+	if (!sip_cfg.pedanticsipchecking || req->method == SIP_REGISTER) {
 		struct sip_pvt tmp_dialog = {
 			.callid = callid,
 		};