diff --git a/app/src/main/java/io/xpipe/app/rdp/WindowsAppRdpClient.java b/app/src/main/java/io/xpipe/app/rdp/WindowsAppRdpClient.java
index 664c9ef05..e62edbdb5 100644
--- a/app/src/main/java/io/xpipe/app/rdp/WindowsAppRdpClient.java
+++ b/app/src/main/java/io/xpipe/app/rdp/WindowsAppRdpClient.java
@@ -21,7 +21,7 @@ public class WindowsAppRdpClient implements ExternalApplicationType.MacApplicati
 
     @Override
     public void launch(RdpLaunchConfig configuration) throws Exception {
-        var adjusted = AppDisplayScale.getEffectiveDisplayScale() >= 2.0
+        var adjusted = AppDisplayScale.getEffectiveDisplayScale() >= 2.0 && configuration.getConfig().get("ForceHiDpiOptimizations").isEmpty()
                 ? configuration
                         .getConfig()
                         .overlay(Map.of("ForceHiDpiOptimizations", new RdpConfig.TypedValue("i", "1")))
diff --git a/app/src/main/java/io/xpipe/app/util/RdpConfig.java b/app/src/main/java/io/xpipe/app/util/RdpConfig.java
index 762d2148a..9f4bb3f39 100644
--- a/app/src/main/java/io/xpipe/app/util/RdpConfig.java
+++ b/app/src/main/java/io/xpipe/app/util/RdpConfig.java
@@ -72,7 +72,8 @@ public class RdpConfig {
     }
 
     public Optional<TypedValue> get(String key) {
-        return Optional.ofNullable(content.get(key));
+        var found = content.entrySet().stream().filter(e -> e.getKey().equalsIgnoreCase(key)).findFirst();
+        return found.map(Map.Entry::getValue);
     }
 
     @Value