diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index c832bcc03d4..709892ee141 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -11,6 +11,7 @@ var/global/list/joblist = list()					//list of all jobstypes, minus borg and AI
 var/global/list/flag_list = list()					//list of flags during Nations gamemode
 var/global/list/airlocks = list()					//list of all airlocks
 var/global/list/singularities = list()				//list of all singularities
+var/global/list/janitorialcarts = list()				//list of all singularities
 
 var/global/list/aibots = list() // AI controlled bots
 var/global/list/table_recipes = list() //list of all table craft recipes
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index a710738c757..0262d1f99a6 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -500,7 +500,7 @@
 		if(!CbotData.len)
 			CbotData[++CbotData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
 		var/CartData[0]
-		for(var/obj/structure/janitorialcart/B in world)
+		for(var/obj/structure/janitorialcart/B in janitorialcarts)
 			var/turf/bl = get_turf(B)
 			if(bl)
 				if(bl.z != cl.z)
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index d22db9cc1d7..6972d1eb908 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -232,8 +232,13 @@
 
 /obj/structure/janitorialcart/New()
 	create_reagents(100)
+	janitorialcarts += src
 
 
+/obj/structure/janitorialcart/Destroy()
+	janitorialcarts -= src
+	return ..()
+
 /obj/structure/janitorialcart/proc/wet_mop(obj/item/weapon/mop, mob/user)
 	if(reagents.total_volume < 1)
 		user << "[src] is out of water!</span>"