diff --git a/app/src/main/java/org/linphone/contacts/LinphoneContact.java b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
index 7b46e6425..f4ed675f5 100644
--- a/app/src/main/java/org/linphone/contacts/LinphoneContact.java
+++ b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
@@ -352,9 +352,10 @@ public class LinphoneContact extends AndroidContact
             if (mFriend.getVcard() != null) {
                 mFriend.getVcard().setFamilyName(mLastName);
                 mFriend.getVcard().setGivenName(mFirstName);
-            }
-            if (mOrganization != null) {
-                mFriend.getVcard().setOrganization(mOrganization);
+
+                if (mOrganization != null) {
+                    mFriend.getVcard().setOrganization(mOrganization);
+                }
             }
 
             if (!created) {