diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 0ac22f96e81bb3e00f4403ce5241958817a938fd..03df2dda6bdd43b3111f6b36aae4f5a8b9d283d5 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -889,7 +889,14 @@ static void __sip_destroy(struct sip_pvt *p, int lockowner)
 		p->route = NULL;
 	}
 	if (p->registry) {
-		p->registry->call=NULL;
+		/* Carefully unlink from registry */
+		struct sip_registry *reg;
+		reg = registrations;
+		while(reg) {
+			if ((reg == p->registry) && (p->registry->call == p))
+				p->registry->call=NULL;
+			reg = reg->next;
+		}
 	}
 	/* Unlink us from the owner if we have one */
 	if (p->owner) {