diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index d7c985f1dfb..3afa61428a0 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -179,6 +179,7 @@
 	on = !on
 	update_icon()
 	if(on)
+		START_PROCESSING(SSmachinery, src)
 		if (M.loc == loc)
 			wash(M)
 			process_heat(M)
@@ -271,7 +272,7 @@
 
 /obj/structure/machinery/shower/process()
 	if(!on)
-		return
+		return PROCESS_KILL
 	wash_floor()
 	if(!mobpresent)
 		return
diff --git a/html/changelogs/hellfirejag-kill-shower-processing.yml b/html/changelogs/hellfirejag-kill-shower-processing.yml
new file mode 100644
index 00000000000..a11cbcdeadc
--- /dev/null
+++ b/html/changelogs/hellfirejag-kill-shower-processing.yml
@@ -0,0 +1,4 @@
+author: Hellfirejag
+delete-after: True
+changes:
+  - bugfix: "Made showers no longer require always processing."