Index: apps/app_confbridge.c
===================================================================
--- apps/app_confbridge.c	(revision 171962)
+++ apps/app_confbridge.c	(working copy)
@@ -325,7 +325,10 @@
 			play_prompt_to_channel(conference_bridge, conference_bridge_user->chan, "conf-onlyperson");
 		}
 		/* If we need to start music on hold on the channel do so now */
-		if (ast_test_flag(&conference_bridge_user->flags, OPTION_MUSICONHOLD)) {
+		/* We need to re-check the number of users in the conference bridge here because another conference bridge
+		 * participant could have joined while the above prompt was playing for the first user.
+		 */
+		if (conference_bridge->users == 1 && ast_test_flag(&conference_bridge_user->flags, OPTION_MUSICONHOLD)) {
 			ast_moh_start(conference_bridge_user->chan, conference_bridge_user->opt_args[OPTION_MUSICONHOLD_CLASS], NULL);
 		}
 		return;