diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java
index bd8c2cfbc16d17d783e318001a1800dc070e1734..bf17f731b8460d62dca954f04a847eeecb27af81 100644
--- a/router/java/src/net/i2p/router/startup/WorkingDir.java
+++ b/router/java/src/net/i2p/router/startup/WorkingDir.java
@@ -99,11 +99,13 @@ public class WorkingDir {
                         // then attempt to use, resulting in a router with no client applications. Checking
                         // for clients.config.d determines if the directory is "Real" or not.
                         File clientAppsConfig = new File(checkOld.getAbsolutePath(), "clients.config.d");
-                        if (routerConfig.exists() && clientAppsConfig.exists() && clientAppsConfig.isDirectory())
-                            home = appdata;
-                        clientAppsConfig = new File(checkOld.getAbsolutePath(), "clients.config");
-                        if (routerConfig.exists() && clientAppsConfig.exists())
+                        if (routerConfig.exists() && clientAppsConfig.exists() && clientAppsConfig.isDirectory()) {
                             home = appdata;
+                        } else {
+                            clientAppsConfig = new File(checkOld.getAbsolutePath(), "clients.config");
+                            if (routerConfig.exists() && clientAppsConfig.exists())
+                                home = appdata;
+                        }
                     }
                 }
                 dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_WINDOWS);