diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index 37f925bfe97de026b409e976f34ce9293572bd70..474276545970e84cd3adf84f2916e37f860c0f67 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -821,6 +821,7 @@ JamiAccount::changeArchivePassword(const std::string& password_old, const std::s
 {
     try {
         accountManager_->changePassword(password_old, password_new);
+        archiveHasPassword_ = not password_new.empty();
     } catch (const std::exception& ex) {
         JAMI_ERR("[Account %s] Can't change archive password: %s", getAccountID().c_str(), ex.what());
         if (password_old.empty()) {