diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm
index 29159503ab..7234baf50e 100644
--- a/code/game/objects/structures/fireaxe.dm
+++ b/code/game/objects/structures/fireaxe.dm
@@ -12,10 +12,13 @@
 	var/hitstaken = 0
 	var/locked = 1
 	var/smashed = 0
+	var/starts_with_axe = TRUE
 
 /obj/structure/fireaxecabinet/Initialize()
 	. = ..()
-	fireaxe = new /obj/item/weapon/material/twohanded/fireaxe()
+	if(starts_with_axe)
+		fireaxe = new /obj/item/weapon/material/twohanded/fireaxe()
+	update_icon()
 
 /obj/structure/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
 	//..() //That's very useful, Erro
@@ -184,3 +187,7 @@
 	if(fireaxe)
 		hasaxe = 1
 	icon_state = text("fireaxe[][][][]",hasaxe,open,hitstaken,smashed)
+
+
+/obj/structure/fireaxecabinet/empty
+	starts_with_axe = FALSE
diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index e4673f4a1e..c0c8b7a715 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -492,9 +492,6 @@ lel
 "bq" = (
 /obj/machinery/vending/wardrobe/atmosdrobe,
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/structure/sign/scenery/fakefireaxe{
-	pixel_y = 32
-	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos/monitoring)
 "br" = (
diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm
index fe9bade7d6..88cbfaf5bb 100644
--- a/maps/groundbase/gb-z3.dmm
+++ b/maps/groundbase/gb-z3.dmm
@@ -7,9 +7,6 @@ lol
 /area/groundbase/exploration/equipment)
 "ab" = (
 /obj/machinery/suit_cycler/medical,
-/obj/structure/sign/scenery/fakefireaxe{
-	pixel_y = 32
-	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/paramedic)
 "ak" = (
diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm
index 3b0600bcea..5eb1f2bfe8 100644
--- a/maps/stellar_delight/stellar_delight1.dmm
+++ b/maps/stellar_delight/stellar_delight1.dmm
@@ -19485,9 +19485,6 @@
 /area/security/detectives_office)
 "Pz" = (
 /obj/structure/table/bench/marble,
-/obj/structure/fireaxecabinet{
-	pixel_y = -32
-	},
 /obj/effect/landmark/start/paramedic,
 /turf/simulated/floor/tiled/eris/white/bluecorner,
 /area/stellardelight/deck1/paramedic)
diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm
index b99e5f9cb1..0736eaa21e 100644
--- a/maps/stellar_delight/stellar_delight2.dmm
+++ b/maps/stellar_delight/stellar_delight2.dmm
@@ -1743,9 +1743,6 @@
 /obj/machinery/camera/network/engineering{
 	dir = 4
 	},
-/obj/structure/sign/scenery/fakefireaxe{
-	pixel_x = -32
-	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/atmos/monitoring)
 "dU" = (
@@ -18490,9 +18487,6 @@
 /obj/structure/flora/pottedplant/smallcactus{
 	pixel_y = 14
 	},
-/obj/structure/fireaxecabinet{
-	pixel_y = 28
-	},
 /turf/simulated/floor/wood,
 /area/stellardelight/deck2/briefingroom)
 "Pm" = (
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 9c2c8146e5..24244fe74e 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -6733,9 +6733,6 @@
 /area/tether/surfacebase/outside/outside3)
 "ajH" = (
 /obj/machinery/computer/secure_data,
-/obj/structure/fireaxecabinet{
-	pixel_y = 30
-	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
 "ajI" = (