diff --git a/keepassxc-browser/content/fill.js b/keepassxc-browser/content/fill.js
index b6a5548..2ab54e5 100644
--- a/keepassxc-browser/content/fill.js
+++ b/keepassxc-browser/content/fill.js
@@ -254,7 +254,9 @@ kpxcFill.fillInCredentials = async function(combination, predefinedUsername, uui
     // Fill password
     if (combination.password) {
         // Show a notification if password length exceeds the length defined in input
-        if (combination.password.maxLength && selectedCredentials.password.length > combination.password.maxLength) {
+        if (combination.password.maxLength
+            && combination.password.maxLength > 0
+            && selectedCredentials.password.length > combination.password.maxLength) {
             kpxcUI.createNotification('error', tr('errorMessagePaswordLengthExceeded'));
         }