diff --git a/src/switch_channel.c b/src/switch_channel.c
index 9cb028a472..5b4a439b30 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1073,7 +1073,7 @@ SWITCH_DECLARE(const switch_state_handler_table_t *) switch_channel_get_state_ha
 
 	switch_assert(channel != NULL);
 
-	if (index > SWITCH_MAX_STATE_HANDLERS || index > channel->state_handler_index) {
+	if (index >= SWITCH_MAX_STATE_HANDLERS || index > channel->state_handler_index) {
 		return NULL;
 	}
 
diff --git a/src/switch_core.c b/src/switch_core.c
index 6a36e7d7a1..d0d6bd4d4d 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -131,7 +131,7 @@ SWITCH_DECLARE(int) switch_core_add_state_handler(const switch_state_handler_tab
 SWITCH_DECLARE(const switch_state_handler_table_t *) switch_core_get_state_handler(int index)
 {
 
-	if (index > SWITCH_MAX_STATE_HANDLERS || index > runtime.state_handler_index) {
+	if (index >= SWITCH_MAX_STATE_HANDLERS || index > runtime.state_handler_index) {
 		return NULL;
 	}