diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index dfdfeded04..e17a886e10 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -870,7 +870,7 @@ function saveSettings() {
   // check if we've set the basic http password - if so convert it to base64
   if (formJSON["security"]) {
     var password = formJSON["security"]["http_password"];
-    if (password.length > 0) {
+    if (password && password.length > 0) {
       formJSON["security"]["http_password"] = sha256_digest(password);
     }
   }