diff --git a/Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift b/Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
index 8f1997b5d..f82189d61 100644
--- a/Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
+++ b/Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
@@ -197,6 +197,7 @@ final class RoomInfoListViewController: UIViewController {
         mainTableView.estimatedSectionHeaderHeight = 50
         mainTableView.sectionFooterHeight = UITableView.automaticDimension
         mainTableView.estimatedSectionFooterHeight = 50
+        mainTableView.rowHeight = UITableView.automaticDimension
     }
 
     private func render(viewState: RoomInfoListViewState) {
@@ -367,15 +368,6 @@ extension RoomInfoListViewController: UITableViewDelegate {
         row.action?()
     }
     
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        let row = sections[indexPath.section].rows[indexPath.row]
-        
-        switch row.type {
-        default:
-            return UITableView.automaticDimension
-        }
-    }
-    
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         if sections[section].header == nil {
             return 8