diff --git a/CHANGES.rst b/CHANGES.rst
index f0ae4b3a3..57ac0bfcc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,6 +11,7 @@ Improvements:
 Bug fix:
  * Reskin: status bar text is no more readable on iPad (#2276).
  * Reskin: Text in badges should be white in dark theme (#2283).
+ * Crash in Settings in 0.8.1 (#2295).
 
 Changes in 0.8.1 (2019-02-19)
 ===============================================
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index a955504a6..3ea8338fe 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -4256,8 +4256,10 @@ SignOutAlertPresenterDelegate>
 
 - (void)settingsKeyBackupTableViewSectionDidUpdate:(SettingsKeyBackupTableViewSection *)settingsKeyBackupTableViewSection
 {
+    [self.tableView beginUpdates];
     [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:SETTINGS_SECTION_KEYBACKUP_INDEX]
                   withRowAnimation:UITableViewRowAnimationAutomatic];
+    [self.tableView endUpdates];
 }
 
 - (MXKTableViewCellWithTextView *)settingsKeyBackupTableViewSection:(SettingsKeyBackupTableViewSection *)settingsKeyBackupTableViewSection textCellForRow:(NSInteger)textCellForRow