diff --git a/binaries/data/mods/public/autostart/autostart_client.js b/binaries/data/mods/public/autostart/autostart_client.js
index bab3fdf30a..32e79f3980 100644
--- a/binaries/data/mods/public/autostart/autostart_client.js
+++ b/binaries/data/mods/public/autostart/autostart_client.js
@@ -8,7 +8,7 @@ class AutoStartClient
 		{
 			const playerName = cmdLineArgs['autostart-playername'] || "anonymous";
 			const ip = cmdLineArgs['autostart-client'] ?? "127.0.0.1";
-			const port = +cmdLineArgs?.['autostart-port'] ?? 5073;
+			const port = +(cmdLineArgs['autostart-port'] ?? 5073);
 			Engine.StartNetworkJoin(playerName, ip, port, !('autostart-disable-replay' in cmdLineArgs));
 		}
 		catch (e)
diff --git a/binaries/data/mods/public/autostart/autostart_host.js b/binaries/data/mods/public/autostart/autostart_host.js
index 3dec7646e8..787cdbd205 100644
--- a/binaries/data/mods/public/autostart/autostart_host.js
+++ b/binaries/data/mods/public/autostart/autostart_host.js
@@ -5,13 +5,13 @@ class AutoStartHost
 		this.launched = false;
 		this.playerAssignments = {};
 
-		this.maxPlayers = cmdLineArgs['autostart-host-players'] ?? 2;
+		this.maxPlayers = +(cmdLineArgs['autostart-host-players'] ?? 2);
 		this.cmdLineArgs = cmdLineArgs;
 
 		try
 		{
 			const playerName = cmdLineArgs['autostart-playername'] || "anonymous";
-			const port = +cmdLineArgs?.['autostart-port'] ?? 5073;
+			const port = +(cmdLineArgs['autostart-port'] ?? 5073);
 
 			// Stun and password not implemented for autostart.
 			Engine.StartNetworkHost(playerName, port, false, "", !('autostart-disable-replay' in cmdLineArgs));
diff --git a/binaries/data/mods/public/autostart/cmd_line_args.js b/binaries/data/mods/public/autostart/cmd_line_args.js
index dd815f1767..1b78ba8ed6 100644
--- a/binaries/data/mods/public/autostart/cmd_line_args.js
+++ b/binaries/data/mods/public/autostart/cmd_line_args.js
@@ -68,10 +68,10 @@ function parseCmdLineArgs(settings, cmdLineArgs)
 		"skirmishes": "skirmish",
 	}[mapType]);
 	settings.map.selectMap("maps/" + cmdLineArgs['autostart']);
-	settings.mapSize.setSize(+cmdLineArgs['autostart-size'] || 192);
+	settings.mapSize.setSize(+(cmdLineArgs['autostart-size'] ?? 192));
 	settings.biome.setBiome(cmdLineArgs['autostart-biome'] || "random");
 
-	settings.playerCount.setNb(+cmdLineArgs['autostart-players'] || 2);
+	settings.playerCount.setNb(+(cmdLineArgs['autostart-players'] ?? 2));
 
 	const getPlayer = (key, i) => {
 		if (!(('autostart-' + key) in cmdLineArgs))
@@ -103,11 +103,11 @@ function parseCmdLineArgs(settings, cmdLineArgs)
 	}
 
 	// Seeds default to random so we only need to set specific values.
-	if (cmdLineArgs?.['autostart-seed'] != -1)
-		settings.seeds.seed = +cmdLineArgs?.['autostart-seed'] || 0;
+	if (cmdLineArgs['autostart-seed'] != -1)
+		settings.seeds.seed = +(cmdLineArgs['autostart-seed'] ?? 0);
 
-	if (cmdLineArgs?.['autostart-aiseed'] != -1)
-		settings.seeds.AIseed = +cmdLineArgs?.['autostart-aiseed'] || 0;
+	if (cmdLineArgs['autostart-aiseed'] != -1)
+		settings.seeds.AIseed = +(cmdLineArgs['autostart-aiseed'] ?? 0);
 
 	if (cmdLineArgs['autostart-ceasefire'])
 		settings.seeds.ceaserfire.setValue(+cmdLineArgs['autostart-ceasefire']);