diff --git a/0001-authPrompt-Connect-disable-show-password-key-with-pa.patch b/0001-authPrompt-Connect-disable-show-password-key-with-pa.patch
index adafa35..c09c88b 100644
--- a/0001-authPrompt-Connect-disable-show-password-key-with-pa.patch
+++ b/0001-authPrompt-Connect-disable-show-password-key-with-pa.patch
@@ -43,13 +43,15 @@ index e961f39..b6a323f 100644
          this._timedLoginIndicator = new St.Bin({
              style_class: 'login-dialog-timed-login-indicator',
              scale_x: 0,
-@@ -233,6 +241,11 @@ var AuthPrompt = GObject.registerClass({
+@@ -233,6 +241,13 @@ var AuthPrompt = GObject.registerClass({
          this._defaultButtonWell.add_child(this._spinner);
      }
  
 +    _updateShowPasswordIcon() {
-+        let disableShowPassword = this._lockdownSettings.get_boolean(DISABLE_SHOW_PASSWORD_KEY);
-+        this._passwordEntry.set_show_peek_icon(!disableShowPassword);
++        try {
++            const disableShowPassword = this._lockdownSettings.get_boolean(DISABLE_SHOW_PASSWORD_KEY);
++            this._passwordEntry.set_show_peek_icon(!disableShowPassword);
++        } catch (e) {}
 +    }
 +
      showTimedLoginIndicator(time) {
diff --git a/gnome-shell.spec b/gnome-shell.spec
index f569bfd..5f294c8 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -8,7 +8,7 @@
 
 Name:           gnome-shell
 Version:        40.10
-Release:        30%{?dist}
+Release:        31%{?dist}
 Summary:        Window management and application launching for GNOME
 
 License:        GPLv2+
@@ -305,6 +305,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %endif
 
 %changelog
+* Wed Oct 22 2025 Joan Torres <joantolo@redhat.com> - 40.10-31
+- Don't fail if disable-show-password doesn't exist
+  Related: RHEL-109190
+
 * Thu Oct 2 2025 Joan Torres <joantolo@redhat.com> - 40.10-30
 - Fix regression on multiple remote sessions and same user
   Also, add missing fix to keep API/ABI compatibility on GDM greeter proxy.