diff --git a/src/bin_dal_node/daemon.ml b/src/bin_dal_node/daemon.ml
index 2037bfb03118017d71ba41fdd5165ea3673e68a6..7c065c36e057df7303023e07e024fcfe072960a6 100644
--- a/src/bin_dal_node/daemon.ml
+++ b/src/bin_dal_node/daemon.ml
@@ -537,14 +537,17 @@ module Handler = struct
                           should_be_attested index
                           && not (is_attested bitset index)
                         then
-                          if not (contains_traps delegate index) then
-                            Event.emit_warn_attester_did_not_attest_slot
+                          if
+                            parameters.incentives_enable
+                            && contains_traps delegate index
+                          then
+                            Event
+                            .emit_attester_did_not_attest_slot_because_of_traps
                               ~attester:delegate
                               ~slot_index:index
                               ~attested_level:block_level
                           else
-                            Event
-                            .emit_attester_did_not_attest_slot_because_of_traps
+                            Event.emit_warn_attester_did_not_attest_slot
                               ~attester:delegate
                               ~slot_index:index
                               ~attested_level:block_level
diff --git a/src/bin_dal_node/slot_manager.ml b/src/bin_dal_node/slot_manager.ml
index e08486435bd2363a8df22e57b3b8ff295c706f21..24b9427d7e7c0fccfad8b1cd537871a1a570ef7a 100644
--- a/src/bin_dal_node/slot_manager.ml
+++ b/src/bin_dal_node/slot_manager.ml
@@ -316,6 +316,10 @@ let publish_proved_shards ctxt (slot_id : Types.slot_id) ~level_committee
              in
              let store = Node_context.get_store ctxt in
              let traps_store = Store.traps store in
+             (* TODO: https://gitlab.com/tezos/tezos/-/issues/7742
+                The [proto_parameters] are those for the last known finalized
+                level, which may differ from those of the slot level. This will
+                be an issue when the value of the [traps_fraction] changes.*)
              let traps_fraction = proto_parameters.traps_fraction in
              let () =
                maybe_register_trap