diff --git a/src/main/java/com/simibubi/create/content/optics/LightHandlerRenderer.java b/src/main/java/com/simibubi/create/content/optics/LightHandlerRenderer.java
index 8b8d06dfb..578b0b96b 100644
--- a/src/main/java/com/simibubi/create/content/optics/LightHandlerRenderer.java
+++ b/src/main/java/com/simibubi/create/content/optics/LightHandlerRenderer.java
@@ -7,6 +7,9 @@ import net.minecraft.client.renderer.IRenderTypeBuffer;
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.tileentity.TileEntity;
 
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
 public class LightHandlerRenderer<T extends TileEntity & ILightHandler.ILightHandlerProvider> extends SafeTileEntityRenderer<T> {
 	public LightHandlerRenderer(TileEntityRendererDispatcher dispatcher) {
 		super(dispatcher);
@@ -18,4 +21,9 @@ public class LightHandlerRenderer<T extends TileEntity & ILightHandler.ILightHan
 				.getRenderBeams()
 				.forEachRemaining(beam -> beam.render(ms, buffer, partialTicks));
 	}
+
+	@Override
+	public boolean isGlobalRenderer(T te) {
+		return true;
+	}
 }
diff --git a/src/main/java/com/simibubi/create/content/optics/aligner/AlignerBehaviour.java b/src/main/java/com/simibubi/create/content/optics/aligner/AlignerBehaviour.java
index 572dbfccb..4b292dadb 100644
--- a/src/main/java/com/simibubi/create/content/optics/aligner/AlignerBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/optics/aligner/AlignerBehaviour.java
@@ -105,4 +105,9 @@ public class AlignerBehaviour extends AbstractLightHandlingBehaviour<AlignerTile
 		return Iterators.concat(super.getRenderBeams(), collectedBeam == null ? Collections.emptyIterator() : Collections.singleton(collectedBeam)
 				.iterator());
 	}
+
+	@Override
+	protected boolean canUpdateFast() {
+		return false;
+	}
 }
diff --git a/src/main/java/com/simibubi/create/content/optics/behaviour/AbstractLightHandlingBehaviour.java b/src/main/java/com/simibubi/create/content/optics/behaviour/AbstractLightHandlingBehaviour.java
index 3f9d58ee6..8ae59ab59 100644
--- a/src/main/java/com/simibubi/create/content/optics/behaviour/AbstractLightHandlingBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/optics/behaviour/AbstractLightHandlingBehaviour.java
@@ -40,7 +40,7 @@ public abstract class AbstractLightHandlingBehaviour<T extends SmartTileEntity &
 		super.tick();
 		if (properties.scansBeacon && beacon != null && beacon.isRemoved())
 			updateBeaconState();
-		if (needsBeamUpdate)
+		if (needsBeamUpdate && canUpdateFast())
 			updateBeams();
 	}
 
@@ -74,7 +74,10 @@ public abstract class AbstractLightHandlingBehaviour<T extends SmartTileEntity &
 		super.lazyTick();
 		if (properties.scansBeacon)
 			updateBeaconState();
-		requestBeamUpdate();
+		if (canUpdateFast())
+			requestBeamUpdate();
+		else
+			updateBeams();
 	}
 
 	public void requestBeamUpdate() {
@@ -112,4 +115,8 @@ public abstract class AbstractLightHandlingBehaviour<T extends SmartTileEntity &
 	public int getMaxScanRange() {
 		return properties.scanRange;
 	}
+
+	protected boolean canUpdateFast() {
+		return true;
+	}
 }