diff --git a/custom_components/gree_controller/manifest.json b/custom_components/gree_controller/manifest.json
index 1bbab5c..74aabbb 100644
--- a/custom_components/gree_controller/manifest.json
+++ b/custom_components/gree_controller/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "gree_controller",
   "name": "GREE Controller",
-  "version": "0.15.15",
+  "version": "0.15.16",
   "config_flow": true,
   "integration_type": "hub",
   "iot_class": "local_polling",
diff --git a/gree-controller/CHANGELOG.md b/gree-controller/CHANGELOG.md
index f3dde83..c04bb11 100644
--- a/gree-controller/CHANGELOG.md
+++ b/gree-controller/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.15.16
+
+- Makes Dashboard → Global power emergency STOP context-aware instead of permanently prominent whenever any zone is enabled.
+- Keeps the yellow STOP prominent while any unit is powered or automatic thermostat control is currently active.
+- Shows a subdued STOP while schedules, automations, Flows or explicit thermostat control are armed but idle, so the safety gate can still be engaged before the next start.
+- Hides STOP only when every unit is off and no automatic control is armed; an active emergency STOP always remains visible as the green return-to-normal action.
+- Refreshes the STOP state immediately on device, schedule, automation, Flow and control-plan realtime updates.
+
 ## 0.15.15
 
 - Adds a persistent emergency STOP to Dashboard → Global power. Activating it stores a restart-resistant safety gate, clears queued automatic compressor actions, pauses schedules/thermostat automation and makes a one-time attempt to power off enabled units; startup does not replay the OFF command.
diff --git a/gree-controller/README.md b/gree-controller/README.md
index 63f96b8..5d05a43 100644
--- a/gree-controller/README.md
+++ b/gree-controller/README.md
@@ -2,7 +2,7 @@
 
 Local GREE HVAC controller packaged as a Home Assistant add-on, with Web UI, HTTP/WebSocket API, built-in Swagger API documentation, UDP discovery/control, `amd64` and `aarch64` support, ingress, and database backup from `/data/gree-controller.db`.
 
-Version 0.15.15 adds a persistent emergency STOP in Global power and expands Control plan with per-zone reasons and recent automation trigger context, so the add-on clearly shows why climate control is running, waiting or paused.
+Version 0.15.16 makes the Global power emergency STOP context-aware: active control keeps it prominent, armed-but-idle automation shows a subdued STOP, fully idle systems hide it, and an active STOP always exposes the green return-to-normal action.
 
 ![Home Assistant OS + GREE + VLAN topology](https://git.linuxiarz.pl/gru/gree-controller-ha-addon/raw/branch/master/gree-controller/topology-ha-vlan-gree-en.png)
 
diff --git a/gree-controller/config.yaml b/gree-controller/config.yaml
index 3745fc3..24b78fd 100644
--- a/gree-controller/config.yaml
+++ b/gree-controller/config.yaml
@@ -1,5 +1,5 @@
 name: "GREE Controller"
-version: "0.15.15"
+version: "0.15.16"
 slug: "gree_controller"
 description: "Local GREE HVAC controller with Web UI, API, and Home Assistant integration"
 url: "https://git.linuxiarz.pl/gru/gree-controller-ha-addon/"