diff --git a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
index e140b287162aa0696ccdf5ff5c2119e9f3a8577b..617c914fe65ccad1c6055bb8972c2267ac574829 100644
--- a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
+++ b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
@@ -900,10 +900,18 @@ static int _as_mysql_acct_check_tables(mysql_conn_t *mysql_conn)
 			break;
 	}
 	list_iterator_destroy(itr);
-	slurm_mutex_unlock(&as_mysql_cluster_list_lock);
+	if (rc != SLURM_SUCCESS) {
+		slurm_mutex_unlock(&as_mysql_cluster_list_lock);
+		return rc;
+	}
 
-	if (rc != SLURM_SUCCESS)
+	rc = as_mysql_convert_tables(mysql_conn);
+
+	slurm_mutex_unlock(&as_mysql_cluster_list_lock);
+	if (rc != SLURM_SUCCESS) {
+		error("issue converting tables");
 		return rc;
+	}
 
 	if (mysql_db_create_table(mysql_conn, acct_coord_table,
 				  acct_coord_table_fields,