diff --git a/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java b/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java
index 54324ebf..3776b6bd 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java
@@ -51,7 +51,7 @@ public class SunBlindnessStatusEffect extends StatusEffect {
 
     public static boolean hasSunExposure(LivingEntity entity) {
 
-        if (entity.hasNetherPortalCooldown()) { // TODO: test this. Entities shouldn't get sun blindness when existing a portal
+        if (entity.hasNetherPortalCooldown()) {
             return false;
         }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
index f0c23a71..b3dad401 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
@@ -356,15 +356,16 @@ public class Pony extends Living<PlayerEntity> implements Transmittable, Copieab
 
         if (getSpecies() == Race.BAT) {
             if (SunBlindnessStatusEffect.hasSunExposure(entity)) {
+                System.out.println("Sun exposure " + entity);
                 if (ticksInSun < 200) {
                     ticksInSun++;
                 }
 
                 if (ticksInSun == 1) {
-                    entity.addStatusEffect(new StatusEffectInstance(UEffects.SUN_BLINDNESS, SunBlindnessStatusEffect.MAX_DURATION * 10, 1, true, false));
-                    UCriteria.LOOK_INTO_SUN.trigger(entity);
-
-                    if (isClient() && isClientPlayer()) {
+                    if (!isClient()) {
+                        entity.addStatusEffect(new StatusEffectInstance(UEffects.SUN_BLINDNESS, SunBlindnessStatusEffect.MAX_DURATION * 10, 1, true, false));
+                        UCriteria.LOOK_INTO_SUN.trigger(entity);
+                    } else if (isClientPlayer()) {
                         InteractionManager.instance().playLoopingSound(entity, InteractionManager.SOUND_EARS_RINGING);
                     }
                 }