diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 8022bcf5a9..38b69e4a59 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -328,7 +328,15 @@ static int moh_files_generator(struct ast_channel *chan, void *data, int len, in
 	state->sample_queue += samples;
 
 	while (state->sample_queue > 0) {
+		ast_channel_lock(chan);
 		if ((f = moh_files_readframe(chan))) {
+			/* We need to be sure that we unlock
+			 * the channel prior to calling
+			 * ast_write. Otherwise, the recursive locking
+			 * that occurs can cause deadlocks when using
+			 * indirect channels, like local channels
+			 */
+			ast_channel_unlock(chan);
 			state->samples += f->samples;
 			state->sample_queue -= f->samples;
 			res = ast_write(chan, f);
@@ -337,8 +345,10 @@ static int moh_files_generator(struct ast_channel *chan, void *data, int len, in
 				ast_log(LOG_WARNING, "Failed to write frame to '%s': %s\n", chan->name, strerror(errno));
 				return -1;
 			}
-		} else
+		} else {
+			ast_channel_unlock(chan);
 			return -1;	
+		}
 	}
 	return res;
 }
@@ -1422,11 +1432,11 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
 
 static void local_ast_moh_stop(struct ast_channel *chan)
 {
-	struct moh_files_state *state = chan->music_state;
 	ast_clear_flag(chan, AST_FLAG_MOH);
 	ast_deactivate_generator(chan);
 
-	if (state) {
+	ast_channel_lock(chan);
+	if (chan->music_state) {
 		if (chan->stream) {
 			ast_closestream(chan->stream);
 			chan->stream = NULL;
@@ -1438,6 +1448,7 @@ static void local_ast_moh_stop(struct ast_channel *chan)
 		"Channel: %s\r\n"
 		"UniqueID: %s\r\n",
 		chan->name, chan->uniqueid);
+	ast_channel_unlock(chan);
 }
 
 static void moh_class_destructor(void *obj)