diff --git a/src/persistence/profile.cpp b/src/persistence/profile.cpp
index da7f9652e..d0e92e979 100644
--- a/src/persistence/profile.cpp
+++ b/src/persistence/profile.cpp
@@ -519,6 +519,7 @@ void Profile::restartCore()
 void Profile::setPassword(QString newPassword)
 {
     QList<HistoryKeeper::HistMessage> oldMessages = HistoryKeeper::exportMessagesDeleteFile();
+    QByteArray avatar = loadAvatarData(core->getSelfId().publicKey);
 
     password = newPassword;
     passkey = *core->createPasskey(password);
@@ -526,4 +527,5 @@ void Profile::setPassword(QString newPassword)
 
     HistoryKeeper::getInstance()->importMessages(oldMessages);
     Nexus::getDesktopGUI()->reloadHistory();
+    saveAvatar(avatar, core->getSelfId().publicKey);
 }