diff --git a/packages/master/src/ControlConnection.js b/packages/master/src/ControlConnection.js
index d00a1e2d..5ac4990f 100644
--- a/packages/master/src/ControlConnection.js
+++ b/packages/master/src/ControlConnection.js
@@ -170,7 +170,7 @@ class ControlConnection extends BaseConnection {
 			id,
 			name: instance.config.get("instance.name"),
 			assigned_slave: instance.config.get("instance.assigned_slave"),
-			game_port: instance.game_port,
+			game_port: instance.game_port || null,
 			status: instance.status,
 		};
 	}
@@ -182,7 +182,7 @@ class ControlConnection extends BaseConnection {
 				id: instance.config.get("instance.id"),
 				name: instance.config.get("instance.name"),
 				assigned_slave: instance.config.get("instance.assigned_slave"),
-				game_port: instance.game_port,
+				game_port: instance.game_port || null,
 				status: instance.status,
 			});
 		}
@@ -202,7 +202,7 @@ class ControlConnection extends BaseConnection {
 				id: instance.config.get("instance.id"),
 				name: instance.config.get("instance.name"),
 				assigned_slave: instance.config.get("instance.assigned_slave"),
-				game_port: instance.game_port,
+				game_port: instance.game_port || null,
 				status: instance.status,
 			});
 		}
diff --git a/packages/slave/slave.js b/packages/slave/slave.js
index 99c9988c..b6f49f40 100755
--- a/packages/slave/slave.js
+++ b/packages/slave/slave.js
@@ -694,6 +694,8 @@ class Instance extends libLink.Link {
 	}
 
 	async masterConnectionEventEventHandler(message) {
+		this.notifyStatus(this._status);
+
 		await libPlugin.invokeHook(this.plugins, "onMasterConnectionEvent", message.data.event);
 	}