diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index a7f4d5e8d9..8d0b492611 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -336,9 +336,6 @@ namespace SixLabors.ImageSharp.Formats.Png
                                 break;
                             case PngChunkType.End:
                                 goto EOF;
-                            default:
-                                this.SkipChunkDataAndCrc(chunk);
-                                break;
                         }
                     }
                     finally
@@ -1401,6 +1398,8 @@ namespace SixLabors.ImageSharp.Formats.Png
             {
                 chunk = new PngChunk(length, type);
 
+                this.SkipChunkDataAndCrc(chunk);
+
                 return true;
             }