diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java
index 2df318539..aa1ae0cfb 100644
--- a/src/main/java/mekanism/client/ClientProxy.java
+++ b/src/main/java/mekanism/client/ClientProxy.java
@@ -560,6 +560,13 @@ public class ClientProxy extends CommonProxy
 	@Override
 	public EntityPlayer getPlayer(MessageContext context)
 	{
-		return Minecraft.getMinecraft().thePlayer;
+		if(FMLCommonHandler.instance().getEffectiveSide().isServer())
+		{
+			return context.getServerHandler().playerEntity;
+		}
+		else
+		{
+			return Minecraft.getMinecraft().thePlayer;
+		}
 	}
 }
diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java
index 2280b4d9f..0964f08f3 100644
--- a/src/main/java/mekanism/common/network/PacketDataRequest.java
+++ b/src/main/java/mekanism/common/network/PacketDataRequest.java
@@ -49,10 +49,7 @@ public class PacketDataRequest implements IMessageHandler<DataRequestMessage, IM
 				}
 			}
 
-			if(player instanceof EntityPlayerMP)
-			{
-				Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), ((ITileNetwork)tileEntity).getNetworkedData(new ArrayList())), (EntityPlayerMP)player);
-			}
+			Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), ((ITileNetwork)tileEntity).getNetworkedData(new ArrayList())), (EntityPlayerMP)player);
 		}
 		
 		return null;