diff --git a/src/mod/endpoints/mod_loopback/mod_loopback.c b/src/mod/endpoints/mod_loopback/mod_loopback.c
index 0e52352b05..c87f2258ed 100644
--- a/src/mod/endpoints/mod_loopback/mod_loopback.c
+++ b/src/mod/endpoints/mod_loopback/mod_loopback.c
@@ -804,11 +804,10 @@ static switch_status_t loopback_bowout_on_execute_state_handler(switch_core_sess
 
 			switch_channel_caller_extension_masquerade(channel, other_channel, 0);
 			switch_channel_set_state(other_channel, CS_RESET);
-			switch_channel_wait_for_state(other_channel, other_channel, CS_RESET);
+			switch_channel_wait_for_state(other_channel, NULL, CS_RESET);
 			switch_channel_set_variable(channel, "process_cdr", "false");
 			switch_channel_set_variable(b_channel, "process_cdr", "false");
 			switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
-			switch_channel_hangup(b_channel, SWITCH_CAUSE_NORMAL_CLEARING);
 			switch_channel_set_state(other_channel, CS_EXECUTE);
 			switch_core_session_rwunlock(other_session);
 		}
diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index c66c1d1821..f19113dfbd 100644
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -1311,7 +1311,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_nomedia(const char *uuid, switch_medi
 
 			if (other_channel) {
 				if (!switch_core_session_in_thread(session)) {
-					switch_channel_wait_for_state(channel, channel, CS_PARK);
+					switch_channel_wait_for_state(channel, NULL, CS_PARK);
 					switch_channel_wait_for_flag(channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000, NULL);
 					switch_channel_wait_for_flag(channel, CF_MEDIA_ACK, SWITCH_TRUE, 10000, NULL);
 					switch_channel_wait_for_flag(channel, CF_MEDIA_SET, SWITCH_TRUE, 10000, NULL);