diff --git a/Signal/src/view controllers/SettingsTableViewController.m b/Signal/src/view controllers/SettingsTableViewController.m
index f2a5798f2..319cb1c87 100644
--- a/Signal/src/view controllers/SettingsTableViewController.m	
+++ b/Signal/src/view controllers/SettingsTableViewController.m	
@@ -170,6 +170,22 @@ typedef enum {
 }
 
 
+- (BOOL)tableView:(UITableView *)tableView shouldHighlightRowAtIndexPath:(NSIndexPath *)indexPath {
+    switch (indexPath.section) {
+        case kNetworkStatusSection: {
+            return NO;
+        }
+
+        case kUnregisterSection: {
+            return NO;
+        }
+
+        default:
+            return YES;
+    }
+}
+
+
 - (IBAction)unregisterUser:(id)sender {
     UIAlertController *alertController =
         [UIAlertController alertControllerWithTitle:NSLocalizedString(@"CONFIRM_ACCOUNT_DESTRUCTION_TITLE", @"")