diff --git a/Sources/VLCSettingsController.m b/Sources/VLCSettingsController.m
index 006e53e8867d935f70791a783ef2d0c04005d409..829f9fdcf57acd34dbf69057a7f9d18abccbcf60 100644
--- a/Sources/VLCSettingsController.m
+++ b/Sources/VLCSettingsController.m
@@ -223,6 +223,11 @@ NSString * const kVLCSectionTableHeaderViewIdentifier = @"VLCSectionTableHeaderV
     }
 }
 
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return UITableViewAutomaticDimension;
+}
+
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
 {
     return nil;