diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index f3b70f66a89949c3dce2aae2333687600408f29c..eb57130db4a4e848d4e7b4795e3b5d81eb5de389 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -787,7 +787,10 @@ bool
 JamiAccount::changeArchivePassword(const std::string& password_old, const std::string& password_new)
 {
     try {
-        accountManager_->changePassword(password_old, password_new);
+        if (!accountManager_->changePassword(password_old, password_new)) {
+            JAMI_ERR("[Account %s] Can't change archive password", getAccountID().c_str());
+            return false;
+        }
         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());