diff --git a/src/main/java/eu/crushedpixel/replaymod/events/handlers/SpectatingHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/handlers/SpectatingHandler.java
index 936f6df4..ae310ec8 100644
--- a/src/main/java/eu/crushedpixel/replaymod/events/handlers/SpectatingHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/events/handlers/SpectatingHandler.java
@@ -11,6 +11,6 @@ public class SpectatingHandler {
     private static Minecraft mc = Minecraft.getMinecraft();
     
     public static boolean canSpectate(Entity e) {
-        return ((e instanceof EntityPlayer || e instanceof EntityLiving || e instanceof EntityItemFrame) && e != mc.thePlayer);
+        return ((e instanceof EntityPlayer || e instanceof EntityLiving || e instanceof EntityItemFrame) && e != mc.thePlayer && !e.isInvisible());
     } 
 }
diff --git a/src/main/java/eu/crushedpixel/replaymod/renderer/InvisibilityRender.java b/src/main/java/eu/crushedpixel/replaymod/renderer/InvisibilityRender.java
index a61dd5af..4b661f14 100644
--- a/src/main/java/eu/crushedpixel/replaymod/renderer/InvisibilityRender.java
+++ b/src/main/java/eu/crushedpixel/replaymod/renderer/InvisibilityRender.java
@@ -20,7 +20,7 @@ public class InvisibilityRender extends RenderPlayer {
 
     @Override
     public boolean shouldRender(Entity entity, ICamera camera, double camX, double camY, double camZ) {
-        if(PlayerHandler.isHidden(entity.getUniqueID()) ||
+        if(PlayerHandler.isHidden(entity.getUniqueID()) || entity.isInvisible() ||
                 (ReplayHandler.isInReplay() && entity == Minecraft.getMinecraft().thePlayer)) return false;
         return super.shouldRender(entity, camera, camX, camY, camZ);
     }