diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java b/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java
index 447ad6975..ece960090 100644
--- a/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java
+++ b/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java
@@ -125,8 +125,12 @@ public interface ExternalRdpClientType extends PrefsChoiceValue {
         @Override
         public void launch(LaunchConfiguration configuration) throws Exception {
             var file = writeRdpConfigFile(configuration.getTitle(), configuration.getConfig());
-            var escapedPw = configuration.getPassword().getSecretValue().replaceAll("'", "\\\\'");
-            launch(configuration.getTitle(), CommandBuilder.of().addFile(file.toString()).add("/cert-ignore").add("/p:'" + escapedPw + "'"));
+            var b = CommandBuilder.of().addFile(file.toString()).add("/cert-ignore");
+            if (configuration.getPassword() != null) {
+                var escapedPw = configuration.getPassword().getSecretValue().replaceAll("'", "\\\\'");
+                b.add("/p:'" + escapedPw + "'");
+            }
+            launch(configuration.getTitle(), b);
         }
 
         @Override