diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 700ce54cf95..e8a30e7d94f 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -12342,7 +12342,7 @@ static bool fill_alter_inplace_info(THD *thd, TABLE *table,
   for (const Alter_index_visibility *alter_index_visibility :
        alter_info->alter_index_visibility_list) {
     const char *name = alter_index_visibility->name();
-    table_key = find_key_ci(name, table->key_info, table_key_end);
+    
     new_key = find_key_ci(name, ha_alter_info->key_info_buffer, new_key_end);
 
     if (new_key == nullptr) {
@@ -12350,6 +12350,7 @@ static bool fill_alter_inplace_info(THD *thd, TABLE *table,
       return true;
     }
 
+    table_key = find_key_ci(name, table->key_info, table_key_end);
     new_key->is_visible = alter_index_visibility->is_visible();
     ha_alter_info->handler_flags |= Alter_inplace_info::RENAME_INDEX;
     ha_alter_info->add_altered_index_visibility(table_key, new_key);