diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLClip.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLClip.m
index 32c3e94f2ba..ae7b033c205 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLClip.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLClip.m
@@ -310,6 +310,7 @@ static void initTemplatePipelineDescriptors() {
             clearPassDescriptor.stencilAttachment.texture = _stencilTextureRef;
             clearPassDescriptor.stencilAttachment.clearStencil = 0;
             clearPassDescriptor.stencilAttachment.loadAction = MTLLoadActionClear;
+            clearPassDescriptor.stencilAttachment.storeAction = MTLStoreActionStore;
 
             id<MTLCommandBuffer> commandBuf = [_mtlc createCommandBuffer];
             id <MTLRenderCommandEncoder> clearEncoder = [commandBuf renderCommandEncoderWithDescriptor:clearPassDescriptor];
diff --git a/test/jdk/java/awt/image/DrawImage/IncorrectUnmanagedImageRotatedClip.java b/test/jdk/java/awt/image/DrawImage/IncorrectUnmanagedImageRotatedClip.java
index a942e303783..f514222cfbd 100644
--- a/test/jdk/java/awt/image/DrawImage/IncorrectUnmanagedImageRotatedClip.java
+++ b/test/jdk/java/awt/image/DrawImage/IncorrectUnmanagedImageRotatedClip.java
@@ -45,7 +45,7 @@ import static java.awt.image.BufferedImage.TYPE_INT_ARGB;
 /**
  * @test
  * @key headful
- * @bug 8059942
+ * @bug 8059942 8264317
  * @summary Tests rotated clip when unmanaged image is drawn to VI.
  *          Results of the blit to compatibleImage are used for comparison.
  * @run main/othervm -Dsun.java2d.uiScale=1 IncorrectUnmanagedImageRotatedClip