--- a/gfx/layers/wr/ScrollingLayersHelper.cpp
+++ b/gfx/layers/wr/ScrollingLayersHelper.cpp
@@ -26,16 +26,26 @@ ScrollingLayersHelper::ScrollingLayersHe
     // If APZ is disabled then we don't need to push the scrolling clips. We
     // still want to push the layer's local clip though.
     PushLayerLocalClip(aStackingContext);
     return;
   }
 
   Layer* layer = mLayer->GetLayer();
   for (uint32_t i = layer->GetScrollMetadataCount(); i > 0; i--) {
+    const ScrollMetadata& metadata = layer->GetScrollMetadata(i - 1);
+    // The scroll clip on a given metadata is affected by all async transforms
+    // from metadatas "above" it, but not the async transform on the metadata
+    // itself. Therefore we need to push this clip before we push the
+    // corresponding scroll layer, so that when we set an async scroll position
+    // on the scroll layer, the clip isn't affected by it.
+    if (const Maybe<LayerClip>& clip = metadata.GetScrollClip()) {
+      PushLayerClip(clip.ref(), aStackingContext);
+    }
+
     const FrameMetrics& fm = layer->GetFrameMetrics(i - 1);
     if (!fm.IsScrollable()) {
       continue;
     }
     LayerRect contentRect = ViewAs<LayerPixel>(
         fm.GetExpandedScrollableRect() * fm.GetDevPixelsPerCSSPixel(),
         PixelCastJustification::WebRenderHasUnitResolution);
     // TODO: check coordinate systems are sane here
@@ -129,19 +139,22 @@ ScrollingLayersHelper::~ScrollingLayersH
     return;
   }
   if (layer->GetIsFixedPosition()) {
     mBuilder->PopClipAndScrollInfo();
   }
   if (layer->GetScrolledClip()) {
     mBuilder->PopClip();
   }
-  for (int32_t i = layer->GetScrollMetadataCount(); i > 0; i--) {
-    const FrameMetrics& fm = layer->GetFrameMetrics(i - 1);
-    if (!fm.IsScrollable()) {
-      continue;
+  for (uint32_t i = 0; i < layer->GetScrollMetadataCount(); i++) {
+    const FrameMetrics& fm = layer->GetFrameMetrics(i);
+    if (fm.IsScrollable()) {
+      mBuilder->PopScrollLayer();
     }
-    mBuilder->PopScrollLayer();
+    const ScrollMetadata& metadata = layer->GetScrollMetadata(i);
+    if (metadata.GetScrollClip()) {
+      mBuilder->PopClip();
+    }
   }
 }
 
 } // namespace layers
 } // namespace mozilla