diff --git a/packages/twenty-front/src/modules/settings/profile/components/NameFields.tsx b/packages/twenty-front/src/modules/settings/profile/components/NameFields.tsx
index a279c75e3ee1..8ec7efa27fd1 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/NameFields.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/NameFields.tsx
@@ -84,9 +84,13 @@ export const NameFields = ({
       return;
     }
 
+    const { firstName: currentFirstName, lastName: currentLastName } =
+      currentWorkspaceMember.name;
+
     if (
-      currentWorkspaceMember.name?.firstName !== firstName ||
-      currentWorkspaceMember.name?.lastName !== lastName
+      (currentFirstName !== firstName || currentLastName !== lastName) &&
+      firstName !== '' &&
+      lastName !== ''
     ) {
       debouncedUpdate();
     }