diff --git a/src/main/java/eu/crushedpixel/replaymod/events/handlers/MouseInputHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/handlers/MouseInputHandler.java
index e0ffcf3b..68d37002 100644
--- a/src/main/java/eu/crushedpixel/replaymod/events/handlers/MouseInputHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/events/handlers/MouseInputHandler.java
@@ -3,6 +3,8 @@ package eu.crushedpixel.replaymod.events.handlers;
 import eu.crushedpixel.replaymod.entities.CameraEntity;
 import eu.crushedpixel.replaymod.replay.ReplayHandler;
 import net.minecraft.client.Minecraft;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.item.EntityItemFrame;
 import net.minecraftforge.client.event.MouseEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.input.Mouse;
@@ -27,7 +29,8 @@ public class MouseInputHandler {
             if(!rightDown) {
                 rightDown = true;
                 if(mc.pointedEntity != null && ReplayHandler.isCamera() && mc.currentScreen == null) {
-                    ReplayHandler.spectateEntity(mc.pointedEntity);
+                    if(mc.pointedEntity instanceof EntityLiving || mc.pointedEntity instanceof EntityItemFrame)
+                        ReplayHandler.spectateEntity(mc.pointedEntity);
                 }
             }
         } else {