diff --git a/src/main/events/profile/update-profile.ts b/src/main/events/profile/update-profile.ts
index 626f5215..e4a4595c 100644
--- a/src/main/events/profile/update-profile.ts
+++ b/src/main/events/profile/update-profile.ts
@@ -25,7 +25,7 @@ const updateProfile = async (
   _event: Electron.IpcMainInvokeEvent,
   displayName: string,
   newProfileImagePath: string | null
-): Promise<UserProfile | null> => {
+): Promise<UserProfile> => {
   if (!newProfileImagePath) {
     return (await patchUserProfile(displayName)).data;
   }
diff --git a/src/renderer/src/pages/user/user-edit-modal.tsx b/src/renderer/src/pages/user/user-edit-modal.tsx
index d70ec510..992bdb2b 100644
--- a/src/renderer/src/pages/user/user-edit-modal.tsx
+++ b/src/renderer/src/pages/user/user-edit-modal.tsx
@@ -55,9 +55,8 @@ export const UserEditProfileModal = ({
     patchUser(displayName, newImagePath)
       .then(() => {
         updateUser();
-        setNewImagePath(null);
         showSuccessToast("Salvo com sucesso");
-        onClose();
+        cleanFormAndClose();
       })
       .catch(() => {
         showErrorToast("Tente novamente");
@@ -66,9 +65,25 @@ export const UserEditProfileModal = ({
         setIsSaving(false);
       });
   };
+
+  const resetModal = () => {
+    setDisplayName(userProfile.displayName);
+    setNewImagePath(null);
+    setNewImageBase64(null);
+  };
+
+  const cleanFormAndClose = () => {
+    resetModal();
+    onClose();
+  };
+
   return (
     <>
-      <Modal visible={visible} title="Editar Perfil" onClose={onClose}>
+      <Modal
+        visible={visible}
+        title="Editar Perfil"
+        onClose={cleanFormAndClose}
+      >
         <section
           style={{
             display: "flex",