diff --git a/scripts.yaml b/scripts.yaml
index 94d1db8..c9859dd 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -276,11 +276,13 @@ going_upstairs:
   - service: input_boolean.turn_on
     entity_id: input_boolean.night_mode
     alias: Turn on Night Mode
-  - service: input_boolean.turn_off
+  - alias: Turn off Studio Quiet and Gaming Mode
+    service: input_boolean.turn_off
     data: {}
     target:
-      entity_id: input_boolean.studio_quiet
-    alias: Turn off Studio Quiet
+      entity_id:
+      - input_boolean.studio_quiet
+      - input_boolean.gaming_mode
   - alias: Thermostat reminder
     if:
     - alias: If triggered from basement
@@ -775,13 +777,14 @@ cleanup_crash:
 basement_shutdown:
   alias: Basement Shutdown
   sequence:
-  - service: input_boolean.turn_off
+  - alias: Turn off any active modes
+    service: input_boolean.turn_off
     data: {}
     target:
       entity_id:
       - input_boolean.studio_quiet
       - input_boolean.recliner_mode
-    alias: Turn off any active modes
+      - input_boolean.gaming_mode
   - if:
     - condition: not
       conditions: