diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index c2be19ae4de..13a42ccca75 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -1112,6 +1112,7 @@
 	icon_state = "pipe-tagger"
 	var/sort_tag = ""
 	var/partial = 0
+	var/no_override = 0
 
 /obj/structure/disposalpipe/tagger/proc/updatedesc()
 	desc = initial(desc)
@@ -1150,10 +1151,11 @@
 
 /obj/structure/disposalpipe/tagger/transfer(var/obj/disposalholder/H)
 	if(sort_tag)
-		if(partial)
-			H.setpartialtag(sort_tag)
-		else
-			H.settag(sort_tag)
+		if(!no_override || H.destinationTag == "")
+			if(partial)
+				H.setpartialtag(sort_tag)
+			else
+				H.settag(sort_tag)
 	return ..()
 
 /obj/structure/disposalpipe/tagger/partial //needs two passes to tag
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index d32c5674923..1cad66e8e2f 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -59335,8 +59335,8 @@
 /area/quartermaster/office)
 "bZr" = (
 /obj/machinery/conveyor{
-	backwards = 1;
-	dir = 1;
+	backwards = 0;
+	dir = 2;
 	id = "cargo_crates"
 	},
 /turf/simulated/floor/tiled,
@@ -59476,8 +59476,8 @@
 /area/quartermaster/office)
 "bZG" = (
 /obj/machinery/conveyor{
-	backwards = 1;
-	dir = 1;
+	backwards = 0;
+	dir = 2;
 	id = "cargo_crates"
 	},
 /obj/structure/plasticflaps,
@@ -59637,8 +59637,9 @@
 	c_tag = "Warehouse - North"
 	},
 /obj/structure/disposalpipe/tagger{
-	dir = 1;
+	dir = 2;
 	name = "Sorting Office";
+	no_override = 1;
 	sort_tag = "Sorting Office"
 	},
 /turf/simulated/floor/plating,