Index: b/channels/chan_pjsip.c
===================================================================
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -665,12 +665,15 @@ static struct ast_channel *chan_pjsip_ne
 		ast_channel_zone_set(chan, zone);
 	}
 
+	ast_channel_unlock(chan);
+
 	for (var = session->endpoint->channel_vars; var; var = var->next) {
 		char buf[512];
 		pbx_builtin_setvar_helper(chan, var->name, ast_get_encoded_str(
 					var->value, buf, sizeof(buf)));
 	}
 
+	ast_channel_lock(chan);
 	ast_channel_stage_snapshot_done(chan);
 	ast_channel_unlock(chan);
 
