diff --git a/cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/mixins/client/MixinEntityRenderer.java b/cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/mixins/client/MixinEntityRenderer.java
index fba494e58..bb9be72b2 100644
--- a/cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/mixins/client/MixinEntityRenderer.java
+++ b/cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/mixins/client/MixinEntityRenderer.java
@@ -19,6 +19,7 @@
 
 package com.seibel.distanthorizons.cleanroom.mixins.client;
 
+import com.seibel.distanthorizons.common.commonMixins.MixinVanillaFogCommon;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.config.Config;
@@ -68,15 +69,8 @@ public class MixinEntityRenderer
 	@Inject(at = @At("RETURN"), method = "setupFog")
 	private void disableSetupFog(int startCoords, float partialTicks, CallbackInfo ci)
 	{
-		boolean cameraNotInFluid = mc.getRenderViewEntity() != null && !mc.world.getBlockState(mc.getRenderViewEntity().getPosition()).getMaterial().isLiquid();
-		
-		boolean isSpecialFog = mc.player.isPotionActive(MobEffects.BLINDNESS);
-		
-		if (!isSpecialFog
-			&& cameraNotInFluid
-			&& startCoords == 0 // 0 = terrain fog
-			&& !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).isFogStateSpecial()
-			&& !Config.Client.Advanced.Graphics.Fog.enableVanillaFog.get())
+		boolean cancelFog = MixinVanillaFogCommon.cancelFog(startCoords, mc);
+		if (cancelFog)
 		{
 			GlStateManager.setFogStart(A_REALLY_REALLY_BIG_VALUE);
 			GlStateManager.setFogEnd(A_EVEN_LARGER_VALUE);
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/commonMixins/MixinVanillaFogCommon.java b/common/src/main/java/com/seibel/distanthorizons/common/commonMixins/MixinVanillaFogCommon.java
index cb6fa00d2..291fdcc62 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/commonMixins/MixinVanillaFogCommon.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/commonMixins/MixinVanillaFogCommon.java
@@ -92,7 +92,7 @@ public class MixinVanillaFogCommon
 		boolean cancelFog = !isSpecialFog;
 		cancelFog = cancelFog && cameraNotInFluid;
 		#if MC_VER <= MC_1_12_2
-		cancelFog = cancelFog && startCoords == 0;
+		cancelFog = cancelFog && startCoords == 0; // 0 = terrain fog
 		#elif MC_VER < MC_1_21_6
 		cancelFog = cancelFog && (fogMode == FogRenderer.FogMode.FOG_TERRAIN);
 		#endif