diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 0eced4e74b4..7329a7d2db5 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -117,10 +117,8 @@ public:
     */
     if (WSREP(thd) && wsrep_load_data_splitting)
     {
-      handlerton *ht= table->s->db_type();
       // For partitioned tables find underlying hton
-      if (table->file->partition_ht())
-        ht= table->file->partition_ht();
+      handlerton *ht= table->file->partition_ht();
       if (ht->db_type != DB_TYPE_INNODB)
       {
         push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index ca991b34e9f..69164a95be6 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -4747,9 +4747,7 @@ mysql_execute_command(THD *thd)
 #ifdef WITH_WSREP
       if (wsrep && !first_table->view)
       {
-        const handlerton *hton = first_table->table->file->partition_ht() ?
-          first_table->table->file->partition_ht() : first_table->table->file->ht;
-        bool is_innodb= (hton->db_type == DB_TYPE_INNODB);
+        bool is_innodb= first_table->table->file->partition_ht()->db_type == DB_TYPE_INNODB;
 
         // For consistency check inserted table needs to be InnoDB
         if (!is_innodb && thd->wsrep_consistency_check != NO_CONSISTENCY_CHECK)