diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStoreProvider.java
index be04a4858..e0b25a35a 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStoreProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStoreProvider.java
@@ -65,8 +65,7 @@ public class PasswordManagerIdentityStoreProvider extends IdentityStoreProvider
         var hideSshKeyChoice = Bindings.createBooleanBinding(
                 () -> {
                     var pwman = AppPrefs.get().passwordManager().getValue();
-                    var strat = pwman.getKeyConfiguration();
-                    return strat.useInline() && sshKey.get() == null;
+                    return pwman == null || pwman.getKeyConfiguration().useInline() && sshKey.get() == null;
                 },
                 AppPrefs.get().passwordManager(),
                 sshKey);