diff --git a/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java b/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java
index ae7ee6618bfe8..be751d61c223d 100644
--- a/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java
+++ b/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java
@@ -734,6 +734,7 @@ public boolean dispose() {
                 // clear saved_image using transparent pixels
                 // this will be used as the background in the next display
                 if( decoder.saved_image != null ) {
+                    tpix = (byte) decoder.saved_model.getTransparentPixel();
                     for( int i = 0; i < global_width * global_height; i ++ )
                         decoder.saved_image[i] = tpix;
                 }
diff --git a/test/jdk/sun/awt/image/gif/GifErasureTest.java b/test/jdk/sun/awt/image/gif/GifErasureTest.java
new file mode 100644
index 0000000000000..f0156883c392b
--- /dev/null
+++ b/test/jdk/sun/awt/image/gif/GifErasureTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8356320
+ * @summary This test verifies that we enforce the transparent background
+ * when the disposal code is DISPOSAL_BGCOLOR and the transparent pixel
+ * index changes.
+ */
+
+public class GifErasureTest {
+    public static void main(String[] args) throws Throwable {
+        GifBuilder.test(
+                new GifBuilder.FrameDescription(GifBuilder.Disposal.doNotDispose, false),
+                new GifBuilder.FrameDescription(GifBuilder.Disposal.restoreToBackgroundColor, true),
+                new GifBuilder.FrameDescription(GifBuilder.Disposal.doNotDispose, false) );
+    }
+}