diff --git a/engine/src/flutter/impeller/aiks/aiks_unittests.cc b/engine/src/flutter/impeller/aiks/aiks_unittests.cc
index bf85c5a173..da2ae00534 100644
--- a/engine/src/flutter/impeller/aiks/aiks_unittests.cc
+++ b/engine/src/flutter/impeller/aiks/aiks_unittests.cc
@@ -3502,12 +3502,26 @@ TEST_P(AiksTest, ImageColorSourceEffectTransform) {
 TEST_P(AiksTest, CorrectClipDepthAssignedToEntities) {
   Canvas canvas;  // Depth 1 (base pass)
   canvas.DrawRRect(Rect::MakeLTRB(0, 0, 100, 100), {10, 10}, {});  // Depth 2
-  canvas.ClipRRect(Rect::MakeLTRB(0, 0, 50, 50), {10, 10}, {});    // Depth 4
-  canvas.SaveLayer({});                                            // Depth 3
-  canvas.DrawRRect(Rect::MakeLTRB(0, 0, 50, 50), {10, 10}, {});    // Depth 4
+  canvas.Save();
+  {
+    canvas.ClipRRect(Rect::MakeLTRB(0, 0, 50, 50), {10, 10}, {});  // Depth 5
+    canvas.SaveLayer({});                                          // Depth 3
+    {
+      canvas.DrawRRect(Rect::MakeLTRB(0, 0, 50, 50), {10, 10}, {});  // Depth 4
+    }
+    canvas.Restore();  // Restore the savelayer.
+  }
+  canvas.Restore();  // Depth 5 -- this will no longer append a restore entity
+                     //            once we switch to the clip depth approach.
 
   auto picture = canvas.EndRecordingAsPicture();
-  std::array<uint32_t, 4> expected = {2, 4, 3, 4};
+  std::array<uint32_t, 5> expected = {
+      2,  // DrawRRect
+      4,  // ClipRRect
+      3,  // SaveLayer
+      4,  // DrawRRect
+      5,  // Restore (will be removed once we switch to the clip depth approach)
+  };
   std::vector<uint32_t> actual;
 
   picture.pass->IterateAllElements([&](EntityPass::Element& element) -> bool {
diff --git a/engine/src/flutter/impeller/aiks/canvas.cc b/engine/src/flutter/impeller/aiks/canvas.cc
index 2e876eccaa..05b29534ba 100644
--- a/engine/src/flutter/impeller/aiks/canvas.cc
+++ b/engine/src/flutter/impeller/aiks/canvas.cc
@@ -210,9 +210,10 @@ bool Canvas::Restore() {
     return false;
   }
   size_t num_clips = transform_stack_.back().num_clips;
+  current_pass_->PopClips(num_clips, current_depth_);
+
   if (transform_stack_.back().rendering_mode ==
       Entity::RenderingMode::kSubpass) {
-    current_pass_->PopClips(num_clips, current_depth_);
     current_pass_ = GetCurrentPass().GetSuperpass();
     FML_DCHECK(current_pass_);
   }