diff --git a/src/components/main/NewContactModal.tsx b/src/components/main/NewContactModal.tsx
index 1f08e1ce0..9ba8aae55 100644
--- a/src/components/main/NewContactModal.tsx
+++ b/src/components/main/NewContactModal.tsx
@@ -147,7 +147,10 @@ const NewContactModal: FC<OwnProps & StateProps> = ({
           onChange={handleLastNameChange}
         />
         <p className="NewContactModal__help-text">
-          {renderText(lang('NewContact.Phone.Hidden.Text', renderingUser?.firstName), ['emoji', 'simple_markdown'])}
+          {renderText(
+            lang('NewContact.Phone.Hidden.Text', renderingUser?.firstName || ''),
+            ['emoji', 'simple_markdown'],
+          )}
         </p>
         <Checkbox
           checked={shouldSharePhoneNumber}
diff --git a/src/global/actions/api/users.ts b/src/global/actions/api/users.ts
index 906d21b15..e8548ac81 100644
--- a/src/global/actions/api/users.ts
+++ b/src/global/actions/api/users.ts
@@ -194,12 +194,11 @@ async function updateContact(
     });
   }
 
-  global = getGlobal();
   if (result) {
     getActions().loadChatSettings({ chatId: userId });
 
     setGlobal(updateUser(
-      global,
+      getGlobal(),
       user.id,
       {
         firstName,
@@ -208,6 +207,7 @@ async function updateContact(
     ));
   }
 
+  global = getGlobal();
   global = updateManagementProgress(global, ManagementProgress.Complete);
   global = closeNewContactDialog(global);
   setGlobal(global);
diff --git a/src/util/phoneNumber.ts b/src/util/phoneNumber.ts
index c822ebbaa..7ebf1f69e 100644
--- a/src/util/phoneNumber.ts
+++ b/src/util/phoneNumber.ts
@@ -32,6 +32,10 @@ export function getCountryFromPhoneNumber(phoneCodeList: ApiCountryCode[], input
 }
 
 export function formatPhoneNumber(input: string, country?: ApiCountryCode) {
+  if (!input) {
+    return '';
+  }
+
   let phoneNumber = input.replace(/[^\d]+/g, '');
   if (country) {
     phoneNumber = phoneNumber.substr(country.countryCode.length);
@@ -81,6 +85,10 @@ function getBestPattern(numberWithoutCode: string, patterns?: string[]) {
 }
 
 export function formatPhoneNumberWithCode(phoneCodeList: ApiCountryCode[], phoneNumber: string) {
+  if (!phoneNumber) {
+    return '';
+  }
+
   const numberWithPlus = phoneNumber.startsWith('+') ? phoneNumber : `+${phoneNumber}`;
   const country = getCountryFromPhoneNumber(phoneCodeList, numberWithPlus);
   if (!country) {