diff --git a/packages/controller/src/ControlConnection.ts b/packages/controller/src/ControlConnection.ts
index e67e04b7..c30512ed 100644
--- a/packages/controller/src/ControlConnection.ts
+++ b/packages/controller/src/ControlConnection.ts
@@ -268,7 +268,7 @@ export default class ControlConnection extends BaseConnection {
 			instance.config.get("instance.name"),
 			instance.id,
 			instance.config.get("instance.assigned_host"),
-			instance.config.get("factorio.game_port"),
+			instance.game_port,
 			instance.status,
 		);
 	}
@@ -280,7 +280,7 @@ export default class ControlConnection extends BaseConnection {
 				instance.config.get("instance.name"),
 				instance.id,
 				instance.config.get("instance.assigned_host"),
-				instance.config.get("factorio.game_port"),
+				instance.game_port,
 				instance.status,
 			));
 		}
@@ -301,7 +301,7 @@ export default class ControlConnection extends BaseConnection {
 					instance.config.get("instance.name"),
 					instance.id,
 					instance.config.get("instance.assigned_host"),
-					instance.config.get("factorio.game_port"),
+					instance.game_port,
 					instance.status,
 				)
 			));
diff --git a/packages/controller/src/HostConnection.ts b/packages/controller/src/HostConnection.ts
index 5dd757ec..ad630579 100644
--- a/packages/controller/src/HostConnection.ts
+++ b/packages/controller/src/HostConnection.ts
@@ -177,7 +177,7 @@ export default class HostConnection extends BaseConnection {
 
 		let prev = instance.status;
 		instance.status = request.status as lib.InstanceStatus;
-		instance.config.set("factorio.game_port", request.gamePort);
+		instance.game_port = request.gamePort || null;
 		logger.verbose(`Instance ${instance.config.get("instance.name")} State: ${instance.status}`);
 		this._controller.instanceUpdated(instance);
 		await lib.invokeHook(this._controller.plugins, "onInstanceStatusChanged", instance, prev);
diff --git a/packages/controller/src/InstanceInfo.ts b/packages/controller/src/InstanceInfo.ts
index 64111eda..7af224cf 100644
--- a/packages/controller/src/InstanceInfo.ts
+++ b/packages/controller/src/InstanceInfo.ts
@@ -26,6 +26,7 @@ export type InstanceStatus =
 export default class InstanceInfo {
 	config: lib.InstanceConfig;
 	status: InstanceStatus;
+	game_port: number | null = null;
 
 	constructor(
 		{ config, status }: