diff --git a/Podfile.lock b/Podfile.lock
index 76bee4312..b136adc8b 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -140,7 +140,7 @@ CHECKOUT OPTIONS:
     :commit: 03cde781234ade464dd26914d87e6e95afde1119
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :commit: 2e06bb148f07e36ab1fcb5de47910e28c0c31fef
+    :commit: 1ebb82f98715b672474c5c0f27d8b18ec740fced
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 41b57bb2fc292a814f758441a05243eb38457027
diff --git a/Signal/src/view controllers/OWSConversationSettingsTableViewController.m b/Signal/src/view controllers/OWSConversationSettingsTableViewController.m
index 6fb6eb9c6..5ae1c55d2 100644
--- a/Signal/src/view controllers/OWSConversationSettingsTableViewController.m	
+++ b/Signal/src/view controllers/OWSConversationSettingsTableViewController.m	
@@ -241,8 +241,7 @@ static NSString *const OWSConversationSettingsTableViewControllerSegueShowGroupM
     }
 
     if (section == OWSConversationSettingsTableViewControllerSectionContact) {
-        if (self.isGroupThread) {
-            // No fingerprint for group thread.
+        if (!self.thread.hasSafetyNumbers) {
             baseCount -= 1;
         }
 
@@ -256,8 +255,10 @@ static NSString *const OWSConversationSettingsTableViewControllerSegueShowGroupM
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(nonnull NSIndexPath *)indexPath
 {
-    if (self.isGroupThread && indexPath.section == OWSConversationSettingsTableViewControllerSectionContact) {
-        // Since fingerprint cell is hidden for group threads we offset our index path
+    if (indexPath.section == OWSConversationSettingsTableViewControllerSectionContact
+        && !self.thread.hasSafetyNumbers) {
+
+        // Since fingerprint cell is hidden for some threads we offset our index path
         NSIndexPath *offsetIndexPath = [NSIndexPath indexPathForRow:indexPath.row + 1 inSection:indexPath.section];
         return [super tableView:tableView cellForRowAtIndexPath:offsetIndexPath];
     }
@@ -411,7 +412,7 @@ static NSString *const OWSConversationSettingsTableViewControllerSegueShowGroupM
 
 - (NSIndexPath *)indexPathForDurationSlider
 {
-    if (self.isGroupThread) {
+    if (!self.thread.hasSafetyNumbers) {
         return [NSIndexPath
             indexPathForRow:OWSConversationSettingsTableViewControllerCellIndexSetDisappearingMessagesDuration - 1
                   inSection:OWSConversationSettingsTableViewControllerSectionContact];