diff --git a/core/src/main/java/bisq/core/api/CoreAccountService.java b/core/src/main/java/bisq/core/api/CoreAccountService.java
index 5d916ae679..2158c96678 100644
--- a/core/src/main/java/bisq/core/api/CoreAccountService.java
+++ b/core/src/main/java/bisq/core/api/CoreAccountService.java
@@ -117,6 +117,7 @@ public class CoreAccountService {
     public void changePassword(String oldPassword, String newPassword) {
         if (!isAccountOpen()) throw new IllegalStateException("Cannot change password on unopened account");
         if (!StringUtils.equals(this.password, oldPassword)) throw new IllegalStateException("Incorrect password");
+        if (newPassword != null && newPassword.length() < 8) throw new IllegalStateException("Password must be at least 8 characters");
         keyStorage.saveKeyRing(keyRing, oldPassword, newPassword);
         this.password = newPassword;
         synchronized (listeners) {