diff --git a/SignalMessaging/contacts/OWSContactsManager.m b/SignalMessaging/contacts/OWSContactsManager.m
index 5c65d4dc5..8ff188f38 100644
--- a/SignalMessaging/contacts/OWSContactsManager.m
+++ b/SignalMessaging/contacts/OWSContactsManager.m
@@ -709,7 +709,12 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
         NSString *leftName = [self comparableNameForSignalAccount:left];
         NSString *rightName = [self comparableNameForSignalAccount:right];
 
-        return [leftName compare:rightName];
+        NSComparisonResult nameComparison = [leftName compare:rightName];
+        if (nameComparison == NSOrderedSame) {
+            return [left.recipientId compare:right.recipientId];
+        }
+
+        return nameComparison;
     };
 }