diff --git a/src/main/java/me/jellysquid/mods/sodium/client/frapi/render/NonTerrainBlockRenderContext.java b/src/main/java/me/jellysquid/mods/sodium/client/frapi/render/NonTerrainBlockRenderContext.java
index 271b253a7c..9c5ce7ea65 100644
--- a/src/main/java/me/jellysquid/mods/sodium/client/frapi/render/NonTerrainBlockRenderContext.java
+++ b/src/main/java/me/jellysquid/mods/sodium/client/frapi/render/NonTerrainBlockRenderContext.java
@@ -101,8 +101,10 @@ public void render(BlockRenderView blockView, BakedModel model, BlockState state
         model.emitBlockQuads(blockView, state, pos, this.randomSupplier, this);
 
         this.vertexWriter = null;
+        this.ctx.updateWorld(null);
     }
 
+    // TODO: should this be changed to use a BlockOcclusionCache? if so then it can be shared with the terrain pipeline
     private boolean isFaceVisible(@Nullable Direction face) {
         if (face == null || !this.enableCulling) {
             return true;
diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/compile/pipeline/BlockRendererFRAPI.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/compile/pipeline/BlockRendererFRAPI.java
index 103ba8761f..9c70b0f4ea 100644
--- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/compile/pipeline/BlockRendererFRAPI.java
+++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/compile/pipeline/BlockRendererFRAPI.java
@@ -57,6 +57,7 @@ public class BlockRendererFRAPI extends AbstractBlockRenderContext implements IB
     private LightMode defaultLightMode;
     // Default material (can be overridden by blend mode per-quad)
     private Material defaultMaterial;
+    private ChunkModelBuilder defaultModelBuilder;
     // Cull cache (as it's checked per-quad instead of once in vanilla)
     private int cullCompletionFlags;
     private int cullResultFlags;
@@ -100,6 +101,7 @@ public void renderModel(BlockRenderContext ctx, ChunkBuildBuffers buffers, Chunk
         this.renderOffset = ctx.state().getModelOffset(ctx.world(), ctx.pos());
         this.defaultLightMode = this.getLightingMode(ctx.state(), ctx.model());
         this.defaultMaterial = DefaultMaterials.forBlockState(ctx.state());
+        this.defaultModelBuilder = buffers.get(this.defaultMaterial);
 
         // Actually render
         ctx.model().emitBlockQuads(ctx.world(), ctx.state(), ctx.pos(), this.randomSupplier, this);
@@ -142,18 +144,21 @@ private void processQuad(MutableQuadViewImpl quad) {
         final boolean emissive = mat.emissive();
         final BlendMode blendMode = mat.blendMode();
         final Material material;
+        final ChunkModelBuilder modelBuilder;
         if (blendMode == BlendMode.DEFAULT) {
             material = this.defaultMaterial;
+            modelBuilder = this.defaultModelBuilder;
         } else {
             material = DefaultMaterials.forRenderLayer(blendMode.blockRenderLayer);
+            modelBuilder = this.buffers.get(material);
         }
 
         BlockRenderContext ctx = this.ctx;
 
-        colorizeQuad(ctx, quad, colorIndex);
+        this.colorizeQuad(ctx, quad, colorIndex);
         QuadLightData lightData = this.cachedQuadLightData;
-        super.shadeQuad(ctx, quad, lightMode, emissive, lightData);
-        bufferQuad(ctx, quad, lightData.br, material);
+        this.shadeQuad(ctx, quad, lightMode, emissive, lightData);
+        this.bufferQuad(ctx, quad, lightData.br, material, modelBuilder);
     }
 
     private void colorizeQuad(BlockRenderContext ctx, MutableQuadViewImpl quad, int colorIndex) {
@@ -174,7 +179,7 @@ private void colorizeQuad(BlockRenderContext ctx, MutableQuadViewImpl quad, int
         }
     }
 
-    private void bufferQuad(BlockRenderContext ctx, MutableQuadViewImpl quad, float[] brightness, Material material) {
+    private void bufferQuad(BlockRenderContext ctx, MutableQuadViewImpl quad, float[] brightness, Material material, ChunkModelBuilder modelBuilder) {
         ModelQuadOrientation orientation = ModelQuadOrientation.orientByBrightness(brightness);
         ChunkVertexEncoder.Vertex[] vertices = this.vertices;
 
@@ -191,9 +196,8 @@ private void bufferQuad(BlockRenderContext ctx, MutableQuadViewImpl quad, float[
             out.y = ctx.origin().y() + quad.y(srcIndex) + (float) offset.getY();
             out.z = ctx.origin().z() + quad.z(srcIndex) + (float) offset.getZ();
 
-            // TODO: alpha from quad is ignored entirely
-            // TODO: do we need endianness changes to color? (seems ok from tests)
             // FRAPI implementation uses ARGB color format, convert to ABGR.
+            // Due to our vertex format, the alpha from the quad color is ignored entirely.
             out.color = ColorABGR.withAlpha(ColorARGB.toABGR(quad.color(srcIndex)), brightness[srcIndex]);
 
             out.u = quad.u(srcIndex);
@@ -204,8 +208,6 @@ private void bufferQuad(BlockRenderContext ctx, MutableQuadViewImpl quad, float[
             bounds.add(out.x, out.y, out.z, normalFace);
         }
 
-        ChunkModelBuilder modelBuilder = buffers.get(material);
-
         var vertexBuffer = modelBuilder.getVertexBuffer(normalFace);
         vertexBuffer.push(vertices, material);