diff --git a/Source/Core/Core.swift b/Source/Core/Core.swift
index 9d649fe31..dc5687bd3 100644
--- a/Source/Core/Core.swift
+++ b/Source/Core/Core.swift
@@ -793,6 +793,7 @@ extension FormViewController : UITableViewDelegate {
 
     open func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         guard tableView == self.tableView else { return tableView.rowHeight }
+        guard indexPath.row < form[indexPath.section].count else { return tableView.rowHeight }
         let row = form[indexPath.section][indexPath.row]
         return row.baseCell.height?() ?? tableView.rowHeight
     }