diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index c7dbaf8afb..fbf4f61322 100644
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -1788,14 +1788,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 					}
 				}
 
-				if (!table) {
-					table = &originate_state_handlers;
-				}
-
 				if (table) {
 					switch_channel_add_state_handler(originate_status[i].peer_channel, table);
 				}
 
+				switch_channel_add_state_handler(originate_status[i].peer_channel, &originate_state_handlers);
+
 				if ((flags & SOF_NOBLOCK) && originate_status[i].peer_session) {
 					status = SWITCH_STATUS_SUCCESS;
 					*bleg = originate_status[i].peer_session;