diff --git a/apps/api/src/services/iwooos_security_asset_control_plane.py b/apps/api/src/services/iwooos_security_asset_control_plane.py
index 7ff55f6d8..39e0c38f3 100644
--- a/apps/api/src/services/iwooos_security_asset_control_plane.py
+++ b/apps/api/src/services/iwooos_security_asset_control_plane.py
@@ -2527,7 +2527,7 @@ class IwoooSSecurityAssetControlPlaneService:
                                 JOIN latest_run
                                   ON latest_run.run_id = snapshot.run_id
                                 WHERE snapshot.dimension = 'auto_monitoring'
-                                ORDER BY snapshot.detected_at DESC,
+                                ORDER BY snapshot.created_at DESC,
                                          snapshot.snapshot_id DESC
                                 LIMIT 1
                             ),
@@ -2542,7 +2542,7 @@ class IwoooSSecurityAssetControlPlaneService:
                                 JOIN latest_run
                                   ON latest_run.run_id = snapshot.run_id
                                 WHERE snapshot.dimension = 'auto_alerting'
-                                ORDER BY snapshot.detected_at DESC,
+                                ORDER BY snapshot.created_at DESC,
                                          snapshot.snapshot_id DESC
                                 LIMIT 1
                             ),
diff --git a/apps/api/tests/test_iwooos_security_asset_control_plane.py b/apps/api/tests/test_iwooos_security_asset_control_plane.py
index 7ca255227..1b035897c 100644
--- a/apps/api/tests/test_iwooos_security_asset_control_plane.py
+++ b/apps/api/tests/test_iwooos_security_asset_control_plane.py
@@ -1144,7 +1144,7 @@ def test_service_bounds_source_concurrency_for_database_budget(monkeypatch) -> N
     assert "lower(btrim(owner_team)) = 'aisoc'" in wazuh_asset_query
     assert "auto_monitoring" in wazuh_asset_query
     assert "auto_alerting" in wazuh_asset_query
-    assert "snapshot.detected_at DESC" in wazuh_asset_query
+    assert "snapshot.created_at DESC" in wazuh_asset_query
     siem_query = next(
         statement for statement in statements if "FROM alert_rule_catalog" in statement
     )