diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 624a4ddd099..4813f875e3a 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -39,11 +39,15 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
 	/// Target department to send outgoing faxes to
 	var/destination
 
-/obj/machinery/photocopier/faxmachine/New()
-	..()
+/obj/machinery/photocopier/faxmachine/Initialize(mapload)
+	. = ..()
 	GLOB.allfaxes += src
 	update_network()
 
+/obj/machinery/photocopier/faxmachine/Destroy()
+	GLOB.allfaxes -= src
+	return ..()
+
 /obj/machinery/photocopier/faxmachine/proc/update_network()
 	if(department != "Unknown")
 		if(!(("[department]" in GLOB.alldepartments) || ("[department]" in GLOB.hidden_departments) || ("[department]" in GLOB.admin_departments) || ("[department]" in GLOB.hidden_admin_departments)))