diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 4a201cba5b8..acbd7bfa395 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -580,7 +580,11 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
 	else
 		return open(user)
 
-/obj/structure/closet/atom_deconstruct(disassembled = TRUE)
+/obj/structure/closet/handle_deconstruct(disassembled)
+	dump_contents()
+	if(obj_flags & NO_DEBRIS_AFTER_DECONSTRUCTION)
+		return
+
 	if(ispath(material_drop) && material_drop_amount)
 		new material_drop(loc, material_drop_amount)
 	if (secure)
@@ -592,7 +596,6 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
 			electronics.accesses = req_access
 	if(card_reader_installed)
 		new /obj/item/stock_parts/card_reader(drop_location())
-	dump_contents()
 
 /obj/structure/closet/atom_break(damage_flag)
 	. = ..()