diff --git a/configuration/automations/home-music.yaml b/configuration/automations/home-music.yaml
index 5e15900..66efa8c 100644
--- a/configuration/automations/home-music.yaml
+++ b/configuration/automations/home-music.yaml
@@ -32,6 +32,15 @@
           entity_id: media_player.bathroom
           state: playing
   action:
+    - choose:
+        - conditions:
+            - condition: state
+              entity_id: media_player.bedroom
+              state: playing
+          sequence:
+            - service: sonos.join
+              data:
+                master: media_player.bedroom
     - service: sonos.unjoin
       data:
         entity_id: media_player.bathroom
@@ -61,7 +70,7 @@
   trigger:
     - platform: state
       entity_id: sensor.przemyslaws_apple_watch_room_presence
-      from: ra-bathroom
+      from: ra-bedroom
       for: '0:01:00'
   condition:
     - condition: or
@@ -70,6 +79,15 @@
           entity_id: media_player.bedroom
           state: playing
   action:
+    - choose:
+        - conditions:
+            - condition: state
+              entity_id: media_player.bathroom
+              state: playing
+          sequence:
+            - service: sonos.join
+              data:
+                master: media_player.bathroom
     - service: sonos.unjoin
       data:
         entity_id: media_player.bedroom