diff --git a/channels/chan_local.c b/channels/chan_local.c
index cc6ba8d684bc26a880295d985dd6ff9077407d92..636dad7c291f7f141e1c789de2424fe8f18993e0 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -551,7 +551,13 @@ static int local_hangup(struct ast_channel *ast)
 			/* Deadlock avoidance */
 			while (p->owner && ast_channel_trylock(p->owner)) {
 				ast_mutex_unlock(&p->lock);
+				if (ast) {
+					ast_channel_unlock(ast);
+				}
 				usleep(1);
+				if (ast) {
+					ast_channel_lock(ast);
+				}
 				ast_mutex_lock(&p->lock);
 			}
 			if (p->owner) {