diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java
index ec736bee7..2bb508d81 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java
@@ -176,9 +176,11 @@ public abstract class TileEntityBase extends TileEntity implements ITickable{
     }
 
     public final void sendUpdate(){
-        NBTTagCompound compound = this.getSyncCompound();
-        if(compound != null){
-            PacketHandler.theNetwork.sendToAllAround(new PacketUpdateTileEntity(compound, this.getPos()), new NetworkRegistry.TargetPoint(this.worldObj.provider.getDimension(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ(), 64));
+        if(!this.worldObj.isRemote){
+            NBTTagCompound compound = this.getSyncCompound();
+            if(compound != null){
+                PacketHandler.theNetwork.sendToAllAround(new PacketUpdateTileEntity(compound, this.getPos()), new NetworkRegistry.TargetPoint(this.worldObj.provider.getDimension(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ(), 64));
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java
index 9befa2805..18e742a6e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java
@@ -356,9 +356,11 @@ public abstract class TileEntityLaserRelay extends TileEntityBase{
         public void updateEntity(){
             super.updateEntity();
 
-            if((this.isLeftWhitelist != this.lastLeftWhitelist || this.isRightWhitelist != this.lastRightWhitelist) && this.sendUpdateWithInterval()){
-                this.lastLeftWhitelist = this.isLeftWhitelist;
-                this.lastRightWhitelist = this.isRightWhitelist;
+            if(!this.worldObj.isRemote){
+                if((this.isLeftWhitelist != this.lastLeftWhitelist || this.isRightWhitelist != this.lastRightWhitelist) && this.sendUpdateWithInterval()){
+                    this.lastLeftWhitelist = this.isLeftWhitelist;
+                    this.lastRightWhitelist = this.isRightWhitelist;
+                }
             }
         }
     }