diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index f5107dcecba..c12292a05db 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -98,19 +98,25 @@
 	for(var/af in affecting)
 		if(!ismovable(af))
 			continue
+
+		//If we're overrunning the tick, abort and we will continue at the next machine processing
+		if(TICK_CHECK)
+			break
+
 		var/atom/movable/mv = af
-		stoplag()
 		if(QDELETED(mv) || (mv.loc != loc))
 			continue
 		if(!mv.simulated)
 			continue
-		mv.conveyor_act(movedir)
+
+		if(!mv.anchored && mv.simulated && has_gravity(mv))
+			mv.conveyor_act(movedir)
+
 	conveying = FALSE
 
 /atom/movable/proc/conveyor_act(move_dir)
 	set waitfor = FALSE
-	if (!anchored && simulated && has_gravity(src))
-		step(src, move_dir)
+	step(src, move_dir)
 
 /obj/effect/conveyor_act()
 	return
diff --git a/html/changelogs/fluffyghost-conveyoroptimize.yml b/html/changelogs/fluffyghost-conveyoroptimize.yml
new file mode 100644
index 00000000000..5804e455f1c
--- /dev/null
+++ b/html/changelogs/fluffyghost-conveyoroptimize.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: FluffyGhost
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - tweak: "Optimized the conveyor belts to be (hopefully) more efficient."