diff --git a/code/game/objects/effects/particles/smoke.dm b/code/game/objects/effects/particles/smoke.dm
index cd42f702ef9..4f31ffc0869 100644
--- a/code/game/objects/effects/particles/smoke.dm
+++ b/code/game/objects/effects/particles/smoke.dm
@@ -18,9 +18,6 @@
 /particles/smoke/burning
 	position = list(0, 0, 0)
 
-/particles/smoke/burning/fireplace
-	position = list(0, 29, 0)
-
 /particles/smoke/burning/small
 	spawning = 1
 	scale = list(0.8, 0.8)
diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm
index 379e58fb64c..97a9ce8bd4d 100644
--- a/code/game/objects/structures/fireplace.dm
+++ b/code/game/objects/structures/fireplace.dm
@@ -167,7 +167,17 @@
 	fuel_added = 0
 	update_appearance()
 	adjust_light()
-	particles = new /particles/smoke/burning/fireplace()
+	particles = new /particles/smoke/burning()
+
+	switch(dir)
+		if(SOUTH)
+			particles.position = list(0, 29, 0)
+		if(EAST)
+			particles.position = list(-20, 9, 0)
+		if(WEST)
+			particles.position = list(20, 9, 0)
+		if(NORTH) // there is no icon state for SOUTH
+			QDEL_NULL(particles)
 
 /obj/structure/fireplace/proc/put_out()
 	STOP_PROCESSING(SSobj, src)