diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 014cf4af63b..fe625f778ec 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -36,6 +36,9 @@
 	var/weapon_orig_force = 0
 	var/chosen_name
 
+	/// The time it takes for the cleanbot to clean something.
+	var/cleaning_time = 1 SECONDS
+
 	var/list/stolen_valor = list()
 
 	var/static/list/officers_titles = list(
@@ -143,7 +146,7 @@
 
 /mob/living/simple_animal/bot/cleanbot/Initialize(mapload)
 	. = ..()
-	AddComponent(/datum/component/cleaner, 0.1 SECONDS)
+	AddComponent(/datum/component/cleaner, cleaning_time, on_cleaned_callback=CALLBACK(src, /atom/.proc/update_icon_state))
 
 	chosen_name = name
 	get_targets()
@@ -357,7 +360,7 @@
 		start_cleaning(src, T, src)
 		target = null
 		mode = BOT_IDLE
-		update_icon_state()
+
 	else if(istype(A, /obj/item) || istype(A, /obj/effect/decal/remains))
 		visible_message(span_danger("[src] sprays hydrofluoric acid at [A]!"))
 		playsound(src, 'sound/effects/spray2.ogg', 50, TRUE, -6)