diff --git a/src/dehacked.c b/src/dehacked.c
index 530b6906..231f0aa8 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -7150,6 +7150,13 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
 	"S_KARMAFIREWORK4",
 	"S_KARMAFIREWORKTRAIL",
 
+	// Opaque smoke version, to prevent lag
+	"S_OPAQUESMOKE1",
+	"S_OPAQUESMOKE2",
+	"S_OPAQUESMOKE3",
+	"S_OPAQUESMOKE4",
+	"S_OPAQUESMOKE5",
+
 #ifdef SEENAMES
 	"S_NAMECHECK",
 #endif
diff --git a/src/info.c b/src/info.c
index 41711fa4..84cb4cd4 100644
--- a/src/info.c
+++ b/src/info.c
@@ -3140,11 +3140,11 @@ state_t states[NUMSTATES] =
 	{SPR_NULL, 0, 1, {A_FZBoomSmoke}, 1, 0, S_FZEROBOOM12}, // S_FZEROBOOM11
 	{SPR_NULL, 0, 1, {A_FZBoomSmoke}, 0, 0, S_NULL},        // S_FZEROBOOM12
 
-	{SPR_SMOK, FF_TRANS30, 30, {NULL}, 0, 0, S_FZSLOWSMOKE2},	// S_FZSLOWSMOKE1
-	{SPR_SMOK, FF_TRANS30|1, 30, {NULL}, 0, 0, S_FZSLOWSMOKE3},	// S_FZSLOWSMOKE2
-	{SPR_SMOK, FF_TRANS30|2, 30, {NULL}, 0, 0, S_FZSLOWSMOKE4},	// S_FZSLOWSMOKE3
-	{SPR_SMOK, FF_TRANS30|3, 30, {NULL}, 0, 0, S_FZSLOWSMOKE5},	// S_FZSLOWSMOKE4
-	{SPR_SMOK, FF_TRANS30|4, 30, {NULL}, 0, 0, S_NULL},			// S_FZSLOWSMOKE5
+	{SPR_SMOK, 0, 30, {NULL}, 0, 0, S_FZSLOWSMOKE2},	// S_FZSLOWSMOKE1
+	{SPR_SMOK, 1, 30, {NULL}, 0, 0, S_FZSLOWSMOKE3},	// S_FZSLOWSMOKE2
+	{SPR_SMOK, 2, 30, {NULL}, 0, 0, S_FZSLOWSMOKE4},	// S_FZSLOWSMOKE3
+	{SPR_SMOK, 3, 30, {NULL}, 0, 0, S_FZSLOWSMOKE5},	// S_FZSLOWSMOKE4
+	{SPR_SMOK, 4, 30, {NULL}, 0, 0, S_NULL},			// S_FZSLOWSMOKE5
 
 	// Various plants
 	{SPR_SBUS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SONICBUSH
@@ -3394,6 +3394,13 @@ state_t states[NUMSTATES] =
 	{SPR_FWRK, 3|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_KARMAFIREWORK1}, // S_KARMAFIREWORK4
 	{SPR_FWRK, 4|FF_FULLBRIGHT, TICRATE, {NULL}, 0, 0, S_NULL}, // S_KARMAFIREWORKTRAIL
 
+	// Opaque smoke
+	{SPR_SMOK, 0, 4, {NULL}, 0, 0, S_OPAQUESMOKE2}, // S_OPAQUESMOKE1
+	{SPR_SMOK, 1, 5, {NULL}, 0, 0, S_OPAQUESMOKE3}, // S_OPAQUESMOKE2
+	{SPR_SMOK, 2, 6, {NULL}, 0, 0, S_OPAQUESMOKE4}, // S_OPAQUESMOKE3
+	{SPR_SMOK, 3, 7, {NULL}, 0, 0, S_OPAQUESMOKE5}, // S_OPAQUESMOKE4
+	{SPR_SMOK, 4, 8, {NULL}, 0, 0, S_NULL},         // S_OPAQUESMOKE5
+
 #ifdef SEENAMES
 	{SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK
 #endif
diff --git a/src/k_kart.c b/src/k_kart.c
index b1c96773..dee5df73 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2515,6 +2515,7 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
 	for (i = 0; i < 32; i++)
 	{
 		dust = P_SpawnMobj(source->x, source->y, source->z, MT_SMOKE);
+		P_SetMobjState(dust, S_OPAQUESMOKE1);
 		dust->angle = (ANGLE_180/16) * i;
 		P_SetScale(dust, source->scale);
 		dust->destscale = source->scale*10;
@@ -2542,6 +2543,7 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
 		dust = P_SpawnMobj(source->x + P_RandomRange(-radius, radius)*FRACUNIT,
 			source->y + P_RandomRange(-radius, radius)*FRACUNIT,
 			source->z + P_RandomRange(0, height)*FRACUNIT, MT_SMOKE);
+		P_SetMobjState(dust, S_OPAQUESMOKE1);
 		P_SetScale(dust, source->scale);
 		dust->destscale = source->scale*10;
 		dust->scalespeed = source->scale/12;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index f1074e0f..6d36dcc9 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6653,6 +6653,7 @@ void P_MobjThinker(mobj_t *mobj)
 					fixed_t y = P_RandomRange(-35, 35)*mobj->scale;
 					fixed_t z = P_RandomRange(0, 70)*mobj->scale;
 					mobj_t *smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_SMOKE);
+					P_SetMobjState(smoke, S_OPAQUESMOKE1);
 					smoke->scale = mobj->scale * 2;
 					smoke->destscale = mobj->scale * 6;
 					smoke->momz = P_RandomRange(4, 9)*FRACUNIT;
@@ -6674,6 +6675,7 @@ void P_MobjThinker(mobj_t *mobj)
 					else
 					{
 						mobj_t *smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_SMOKE);
+						P_SetMobjState(smoke, S_OPAQUESMOKE1);
 						smoke->scale = mobj->scale;
 						smoke->destscale = mobj->scale*2;
 					}