diff --git a/code/modules/experisci/experiment/types/physical_experiment.dm b/code/modules/experisci/experiment/types/physical_experiment.dm index 5e692931c5b..97f7452085b 100644 --- a/code/modules/experisci/experiment/types/physical_experiment.dm +++ b/code/modules/experisci/experiment/types/physical_experiment.dm @@ -13,7 +13,8 @@ return completed /datum/experiment/physical/perform_experiment_actions(datum/component/experiment_handler/experiment_handler, atom/target) - unregister_events() + if(currently_scanned_atom) + unregister_events() currently_scanned_atom = target linked_experiment_handler = experiment_handler if(register_events())