diff --git a/gui/electron/main/index.ts b/gui/electron/main/index.ts
index 4c87555a2..c3c911bd8 100644
--- a/gui/electron/main/index.ts
+++ b/gui/electron/main/index.ts
@@ -365,9 +365,17 @@ const spawnServer = async () => {
 
   logger.info(options)
 
-  logger.info(`Java start command: ${['-Xmx128M', '-jar', serverJar, (options.steam ? [`--steam=${options.steam}`] : [undefined]), ...(options.install ? [`--install=${options.install}`] : []), ...(options.noUdev ? [`--no-udev`] : []), 'run']}`)
+  const serverArgs = ['-Xmx128M', '-jar', serverJar]
 
-  const process = spawn(javaBin, ['-Xmx128M', '-jar', serverJar, ...(options.steam ? [`--steam=${options.steam}`] : []), ...(options.install ? [`--install=${options.install}`] : []), ...(options.noUdev ? ['--no-udev'] : []), 'run']);
+  if (options.steam) serverArgs.push(`--steam=${options.steam}`)
+  if (options.install) serverArgs.push(`--install=${options.install}`)
+  if (options.noUdev) serverArgs.push(`--no-udev=${options.noUdev}`)
+
+  serverArgs.push('run')
+
+
+  logger.info(`Java start command: ${serverArgs.join(' ')})`)
+  const process = spawn(javaBin, serverArgs)
 
   process.stdout?.on('data', (message) => {
     mainWindow?.webContents.send(IPC_CHANNELS.SERVER_STATUS, {
diff --git a/server/core/src/main/java/dev/slimevr/VRServer.kt b/server/core/src/main/java/dev/slimevr/VRServer.kt
index 4fcd962f6..f1baeaa27 100644
--- a/server/core/src/main/java/dev/slimevr/VRServer.kt
+++ b/server/core/src/main/java/dev/slimevr/VRServer.kt
@@ -85,7 +85,6 @@ class VRServer @JvmOverloads constructor(
 	val deviceManager: DeviceManager
 
 	// UwU
-	@JvmField
 	val featureFlags: FeatureFlags = featureFlagsProvider(this)
 
 	@JvmField
diff --git a/server/core/src/main/java/dev/slimevr/protocol/rpc/installinfo/RPCInstallInfoHandler.kt b/server/core/src/main/java/dev/slimevr/protocol/rpc/installinfo/RPCInstallInfoHandler.kt
index 7281556d4..4fd727672 100644
--- a/server/core/src/main/java/dev/slimevr/protocol/rpc/installinfo/RPCInstallInfoHandler.kt
+++ b/server/core/src/main/java/dev/slimevr/protocol/rpc/installinfo/RPCInstallInfoHandler.kt
@@ -18,7 +18,9 @@ class RPCInstallInfoHandler(var rpcHandler: RPCHandler, var api: ProtocolAPI) {
 	}
 
 	fun onInstalledInfoRequest(conn: GenericConnection, messageHeader: RpcMessageHeader?) {
-		if (!api.server.featureFlags.skipCheckUdev) {
+		if (api.server.featureFlags.skipCheckUdev) {
+			return
+		}
 			val udevResponse = executeShellCommand("udevadm", "cat")
 			if (udevResponse == null) {
 				LogManager.warning("Server couldn't verify if udev is installed")
@@ -35,7 +37,6 @@ class RPCInstallInfoHandler(var rpcHandler: RPCHandler, var api: ProtocolAPI) {
 			conn.send(fbb.dataBuffer())
 		}
 	}
-}
 
 private fun executeShellCommand(vararg command: String): String? = try {
 	val process = ProcessBuilder(*command)
diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt b/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt
index 6648b8ac6..d63782bc7 100644
--- a/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt
+++ b/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt
@@ -45,11 +45,11 @@ val VERSION =
 	(GIT_VERSION_TAG.ifEmpty { GIT_COMMIT_HASH }) +
 		if (GIT_CLEAN) "" else "-dirty"
 
-val featureFlags = FeatureFlags()
 
 fun main(args: Array<String>) {
 	System.setProperty("awt.useSystemAAFontSettings", "on")
 	System.setProperty("swing.aatext", "true")
+	val featureFlags = FeatureFlags()
 
 	val parser: CommandLineParser = DefaultParser()
 	val formatter = HelpFormatter()