diff --git a/apps/global/presence.yaml b/apps/global/presence.yaml
index fb32748..2d728a5 100644
--- a/apps/global/presence.yaml
+++ b/apps/global/presence.yaml
@@ -60,10 +60,6 @@ occupancy_sensors:
     binary_sensor.guestroom_occupancy:
       trigger_conditions: binary_sensor.is_guestroom_sleeping or binary_sensor.day_interval_night
       blocking_conditions: not binary_sensor.someone_home or not input_boolean.guestroom_occupied_tonight
-    retain_condition.desk_occupancy:
-      retain_time: 5 * 60
-      conditions:
-        trigger_conditions: 
-          - sensor.desk_last_motion <= 5
-          #- binary_sensor.alienware_r10
-          #- sensor.macbook_m3_pro_de_pierre_frontmost_app != 'loginwindow' and sensor.macbook_m3_pro_de_pierre_displays == 2
+    binary_sensor.desk_occupancy:
+      trigger_conditions: sensor.desk_last_motion <= 5 or binary_sensor.is_desk_sleeping
+      blocking_conditions: not binary_sensor.someone_home
diff --git a/apps/rooms/desk.yaml b/apps/rooms/desk.yaml
index 417d993..b01efb0 100644
--- a/apps/rooms/desk.yaml
+++ b/apps/rooms/desk.yaml
@@ -4,5 +4,5 @@ light_ambiance:
   entity: light.desk_ambiance
 
   smart_conditions: 
-    trigger_conditions: sensor.desk_last_motion < 3 and binary_sensor.is_dark_outside
+    trigger_conditions: binary_sensor.desk_occupancy and binary_sensor.is_dark_outside
     blocking_conditions: binary_sensor.is_desk_sleeping
\ No newline at end of file