diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 3d2f1e667f4..f50819b3cbb 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -137,6 +137,8 @@
 			return
 
 		if (do_after(user, load_interval, needhand = 0) && boxstartloc == box.loc && ourstartloc == src.loc)
+			if(uses >= max_uses) //catches loading from multiple boxes
+				break
 			uses++
 			to_chat(user, "<span class='notice'>Light loaded: [uses]/[max_uses]</span>")
 			playsound(src.loc, 'sound/machines/click.ogg', 20, 1)
diff --git a/html/changelogs/doxxmedearly - lightreplacer_catch.yml b/html/changelogs/doxxmedearly - lightreplacer_catch.yml
new file mode 100644
index 00000000000..2dae886b7e6
--- /dev/null
+++ b/html/changelogs/doxxmedearly - lightreplacer_catch.yml	
@@ -0,0 +1,6 @@
+author: Doxxmedearly
+
+delete-after: True
+
+changes:
+  - bugfix: "You can no longer overfill a light replacer with bulbs by drawing from multiple boxes at the same time."