diff --git a/Demo/Classes/Presentation/Views/AutolayoutTableViewCell.swift b/Demo/Classes/Presentation/Views/AutolayoutTableViewCell.swift
index 4036a57..489b590 100644
--- a/Demo/Classes/Presentation/Views/AutolayoutTableViewCell.swift
+++ b/Demo/Classes/Presentation/Views/AutolayoutTableViewCell.swift
@@ -21,7 +21,7 @@ class AutolayoutTableViewCell: UITableViewCell, ConfigurableCell {
     static var estimatedHeight: CGFloat? {
         return 150
     }
-    
+
     func configure(with string: T) {
         
         titleLabel.text = LoremIpsumTitle
diff --git a/Sources/TableDirector.swift b/Sources/TableDirector.swift
index c8bfb04..633eeb6 100644
--- a/Sources/TableDirector.swift
+++ b/Sources/TableDirector.swift
@@ -115,7 +115,7 @@ open class TableDirector: NSObject, UITableViewDataSource, UITableViewDelegate {
             cellRegisterer?.register(cellType: row.cellType, forCellReuseIdentifier: row.reuseIdentifier)
         }
         
-        return row.estimatedHeight ?? rowHeightCalculator?.estimatedHeight(forRow: row, at: indexPath) ?? UITableViewAutomaticDimension
+        return row.defaultHeight ?? row.estimatedHeight ?? rowHeightCalculator?.estimatedHeight(forRow: row, at: indexPath) ?? UITableViewAutomaticDimension
     }
     
     open func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {