diff --git a/libs/common/src/sql/procedures/fact_space_occupancy/procedure_insert_fact_daily_space_occupancy.sql b/libs/common/src/sql/procedures/fact_space_occupancy/procedure_insert_fact_daily_space_occupancy.sql
index b3f121b..28a2c43 100644
--- a/libs/common/src/sql/procedures/fact_space_occupancy/procedure_insert_fact_daily_space_occupancy.sql
+++ b/libs/common/src/sql/procedures/fact_space_occupancy/procedure_insert_fact_daily_space_occupancy.sql
@@ -26,11 +26,9 @@ device_logs AS (
         ON device.uuid = "device-status-log".device_id
     LEFT JOIN product
         ON product.uuid = device.product_device_uuid 
-    JOIN params P ON TRUE
     WHERE product.cat_name = 'hps'
       AND "device-status-log".code = 'presence_state'
       AND device.uuid::text = P.device_id
-      AND (P.event_date IS NULL OR "device-status-log".event_time::date = P.event_date)
 ),
 
 presence_detection AS (
@@ -56,6 +54,8 @@ presence_detection_summary AS (
         SUM(motion_detected + presence_detected) AS count_total_presence_detected
     FROM presence_detection pd
     LEFT JOIN device d ON d.uuid = pd.device_id
+    JOIN params P ON TRUE
+    AND (P.event_date IS NULL OR pd.event_time::date = P.event_date)
     GROUP BY 1, 2, 3, 4, 5
 ),