diff --git a/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java b/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
index 94d03f781..d85977d8e 100644
--- a/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
+++ b/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
@@ -25,7 +25,7 @@ public class SuperByteBuffer extends TemplateBuffer {
 	}
 
 	// Vertex Position
-	private MatrixStack transforms;
+	private final MatrixStack transforms;
 
 	// Vertex Texture Coords
 	private SpriteShiftFunc spriteShiftFunc;
@@ -152,7 +152,7 @@ public class SuperByteBuffer extends TemplateBuffer {
 				.endVertex();
 		}
 
-		transforms = new MatrixStack();
+		while (!transforms.isEmpty()) transforms.pop();
 		spriteShiftFunc = null;
 		shouldColor = false;
 		shouldLight = false;
diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/FastRenderDispatcher.java b/src/main/java/com/simibubi/create/foundation/render/backend/FastRenderDispatcher.java
index 07e7e91bf..4e7955e85 100644
--- a/src/main/java/com/simibubi/create/foundation/render/backend/FastRenderDispatcher.java
+++ b/src/main/java/com/simibubi/create/foundation/render/backend/FastRenderDispatcher.java
@@ -45,7 +45,13 @@ public class FastRenderDispatcher {
 
         CreateClient.kineticRenderer.tick();
 
-        runQueue(queuedUpdates.get(world), CreateClient.kineticRenderer::update);
+        ConcurrentHashMap.KeySetView<TileEntity, Boolean> map = queuedUpdates.get(world);
+        map
+                .forEach(te -> {
+                    map.remove(te);
+
+                    CreateClient.kineticRenderer.update(te);
+                });
     }
 
     public static boolean available() {
@@ -64,20 +70,6 @@ public class FastRenderDispatcher {
         RenderWork.enqueue(Minecraft.getInstance().worldRenderer::loadRenderers);
     }
 
-    private static <T> void runQueue(@Nullable ConcurrentHashMap.KeySetView<T, Boolean> changed, Consumer<T> action) {
-        if (changed == null) return;
-
-        if (available()) {
-            // because of potential concurrency issues, we make a copy of what's in the set at the time we get here
-            ArrayList<T> tiles = new ArrayList<>(changed);
-
-            tiles.forEach(action);
-            changed.removeAll(tiles);
-        } else {
-            changed.clear();
-        }
-    }
-
     public static void renderLayer(RenderType layer, Matrix4f viewProjection, double cameraX, double cameraY, double cameraZ) {
         if (!Backend.canUseInstancing()) return;