diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
index 8c827c463..b0477c8f0 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
@@ -21,9 +21,9 @@ trait TileEntity extends net.minecraft.tileentity.TileEntity {
 
   def block = getBlockType
 
-  def isClient = SideTracker.isClient
+  def isClient = !isServer
 
-  def isServer = SideTracker.isServer
+  def isServer = if (world != null) !world.isRemote else SideTracker.isServer
 
   // ----------------------------------------------------------------------- //