diff --git a/code/datums/components/cleaning.dm b/code/datums/components/cleaning.dm
index 492fb5aa4bb..5d9d5992e2a 100644
--- a/code/datums/components/cleaning.dm
+++ b/code/datums/components/cleaning.dm
@@ -1,4 +1,5 @@
 /datum/component/cleaning
+	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
 
 /datum/component/cleaning/Initialize()
 	if(!ismovableatom(parent))
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 3966d700c04..d62d66f335e 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -991,7 +991,7 @@
 		status_flags &= ~CANPUSH
 
 	if(module.clean_on_move)
-		LoadComponent(/datum/component/cleaning)
+		AddComponent(/datum/component/cleaning)
 	else
 		qdel(GetComponent(/datum/component/cleaning))
 
diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm
index 3553b3bb0d1..88524366a65 100644
--- a/code/modules/vehicles/pimpin_ride.dm
+++ b/code/modules/vehicles/pimpin_ride.dm
@@ -14,7 +14,7 @@
 	D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, 4), TEXT_SOUTH = list(0, 7), TEXT_EAST = list(-12, 7), TEXT_WEST = list( 12, 7)))
 
 	if(floorbuffer)
-		LoadComponent(/datum/component/cleaning)
+		AddComponent(/datum/component/cleaning)
 
 /obj/vehicle/ridden/janicart/Destroy()
 	if(mybag)
@@ -50,7 +50,7 @@
 		floorbuffer = TRUE
 		qdel(I)
 		to_chat(user, "<span class='notice'>You upgrade [src] with the floor buffer.</span>")
-		LoadComponent(/datum/component/cleaning)
+		AddComponent(/datum/component/cleaning)
 		update_icon()
 	else
 		return ..()