diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc
index df696f3188d..f93d004d8f9 100644
--- a/storage/innobase/row/row0import.cc
+++ b/storage/innobase/row/row0import.cc
@@ -1820,10 +1820,6 @@ PageConverter::update_records(
 
 	m_rec_iter.open(block);
 
-	if (!page_is_leaf(block->frame)) {
-		return DB_SUCCESS;
-	}
-
 	while (!m_rec_iter.end()) {
 		rec_t*	rec = m_rec_iter.current();
 
@@ -1928,11 +1924,7 @@ PageConverter::update_index_page(
 		return(DB_SUCCESS);
 	}
 
-	if (!page_is_leaf(block->frame)) {
-		return (DB_SUCCESS);
-	}
-
-	return(update_records(block));
+	return page_is_leaf(block->frame) ? update_records(block) : DB_SUCCESS;
 }
 
 /**
diff --git a/storage/xtradb/row/row0import.cc b/storage/xtradb/row/row0import.cc
index 26ed99a483c..39e450bd7c5 100644
--- a/storage/xtradb/row/row0import.cc
+++ b/storage/xtradb/row/row0import.cc
@@ -1820,10 +1820,6 @@ PageConverter::update_records(
 
 	m_rec_iter.open(block);
 
-	if (!page_is_leaf(block->frame)) {
-		return DB_SUCCESS;
-	}
-
 	while (!m_rec_iter.end()) {
 		rec_t*	rec = m_rec_iter.current();
 		ibool	deleted = rec_get_deleted_flag(rec, comp);
@@ -1927,7 +1923,7 @@ PageConverter::update_index_page(
 		return(DB_SUCCESS);
 	}
 
-	return(update_records(block));
+	return page_is_leaf(block->frame) ? update_records(block) : DB_SUCCESS;
 }
 
 /**