diff --git a/Session/Conversations/Settings/OWSConversationSettingsViewController.m b/Session/Conversations/Settings/OWSConversationSettingsViewController.m
index b703a58ff..345a09bc5 100644
--- a/Session/Conversations/Settings/OWSConversationSettingsViewController.m
+++ b/Session/Conversations/Settings/OWSConversationSettingsViewController.m
@@ -1025,8 +1025,11 @@ CGFloat kIconViewLength = 24;
 - (void)saveName
 {
     if (![self.thread isKindOfClass:TSContactThread.class]) { return; }
-    SNContact *contact = [LKStorage.shared getContactWithSessionID:((TSContactThread *)self.thread).contactSessionID];
-    if (contact == nil) { return; }
+    NSString *sessionID = ((TSContactThread *)self.thread).contactSessionID;
+    SNContact *contact = [LKStorage.shared getContactWithSessionID:sessionID];
+    if (contact == nil) {
+        contact = [[SNContact alloc] initWithSessionID:sessionID];
+    }
     NSString *text = [self.displayNameTextField.text stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
     contact.nickname = text.length > 0 ? text : nil;
     [LKStorage writeWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {