diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServer.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServer.java
index 0938aec291..bf61b2d010 100644
--- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServer.java
+++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServer.java
@@ -723,7 +723,8 @@ public class GhidraServer extends UnicastRemoteObject implements GhidraServerHan
 			System.exit(-1);
 		}
 
-		Application.initializeLogging(new File(serverRoot, "server.log"), null);
+		File serverLogFile = new File(serverRoot, "server.log");
+		Application.initializeLogging(serverLogFile, serverLogFile);
 
 		// In the absence of module initialization - we must invoke directly
 		SSLContextInitializer.initialize();
diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServerApplicationLayout.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServerApplicationLayout.java
index 45f4594fc4..8f0f1a3ebd 100644
--- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServerApplicationLayout.java
+++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServerApplicationLayout.java
@@ -57,8 +57,6 @@ public class GhidraServerApplicationLayout extends ApplicationLayout {
 
 		// User directories (don't let anything use the user home directory...there may not be one)
 		userTempDir = ApplicationUtilities.getDefaultUserTempDir(applicationProperties);
-		userSettingsDir = ApplicationUtilities.getDefaultUserSettingsDir(applicationProperties,
-			applicationInstallationDir);
 
 		// Modules - required to find module data files
 		modules = ModuleUtilities.findModules(applicationRootDirs,