diff --git a/paparazzi/src/main/java/app/cash/paparazzi/PaparazziSdk.kt b/paparazzi/src/main/java/app/cash/paparazzi/PaparazziSdk.kt
index dc4f9215b5..a00ddbc26b 100644
--- a/paparazzi/src/main/java/app/cash/paparazzi/PaparazziSdk.kt
+++ b/paparazzi/src/main/java/app/cash/paparazzi/PaparazziSdk.kt
@@ -301,10 +301,10 @@ public class PaparazziSdk @JvmOverloads constructor(
         }
       }
     } finally {
-      // Remove original view from parent, even if there aren't render extensions applied
-      (view.parent as ViewGroup).removeView(view)
+      viewGroup.removeView(modifiedView)
+      // Remove any applied render extensions
       if (modifiedView !== view) {
-        viewGroup.removeView(modifiedView)
+        (view.parent as ViewGroup).removeView(view)
       }
       AnimationHandler.sAnimatorHandler.set(null)
       if (hasComposeRuntime) {