diff --git a/apps/confbridge/conf_state.c b/apps/confbridge/conf_state.c
index 03dd7d9af9..305732f190 100644
--- a/apps/confbridge/conf_state.c
+++ b/apps/confbridge/conf_state.c
@@ -74,6 +74,9 @@ void conf_default_join_waitmarked(struct confbridge_user *user)
 void conf_default_leave_waitmarked(struct confbridge_user *user)
 {
 	conf_remove_user_waiting(user->conference, user);
+	if (user->playing_moh) {
+		conf_moh_stop(user);
+	}
 }
 
 void conf_change_state(struct confbridge_user *user, struct confbridge_state *newstate)
diff --git a/apps/confbridge/conf_state_inactive.c b/apps/confbridge/conf_state_inactive.c
index 24631e2c7c..bc41e611a9 100644
--- a/apps/confbridge/conf_state_inactive.c
+++ b/apps/confbridge/conf_state_inactive.c
@@ -66,7 +66,7 @@ static void join_marked(struct confbridge_user *user)
 
 static void leave_waitmarked(struct confbridge_user *user)
 {
-	conf_remove_user_waiting(user->conference, user);
+	conf_default_leave_waitmarked(user);
 	if (user->conference->waitingusers == 0) {
 		conf_change_state(user, CONF_STATE_EMPTY);
 	}
diff --git a/apps/confbridge/conf_state_single.c b/apps/confbridge/conf_state_single.c
index e3e0ca11c5..b3881fa3df 100644
--- a/apps/confbridge/conf_state_single.c
+++ b/apps/confbridge/conf_state_single.c
@@ -72,6 +72,9 @@ static void join_marked(struct confbridge_user *user)
 static void leave_unmarked(struct confbridge_user *user)
 {
 	conf_remove_user_active(user->conference, user);
+	if (user->playing_moh) {
+		conf_moh_stop(user);
+	}
 
 	if (user->conference->waitingusers) {
 		conf_change_state(user, CONF_STATE_INACTIVE);
diff --git a/apps/confbridge/conf_state_single_marked.c b/apps/confbridge/conf_state_single_marked.c
index f72ef5ec19..c13ef16369 100644
--- a/apps/confbridge/conf_state_single_marked.c
+++ b/apps/confbridge/conf_state_single_marked.c
@@ -71,6 +71,9 @@ static void join_marked(struct confbridge_user *user)
 static void leave_marked(struct confbridge_user *user)
 {
 	conf_remove_user_marked(user->conference, user);
+	if (user->playing_moh) {
+		conf_moh_stop(user);
+	}
 
 	conf_change_state(user, CONF_STATE_EMPTY);
 }