diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
index 4d985992f..68f525305 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.IO;
+
+using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
 using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -23,7 +25,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
         {
             Guard.NotNull(stream, nameof(stream));
 
-            using (var decoder = new PdfJsJpegDecoderCore(configuration, this))
+            using (var decoder = new OrigJpegDecoderCore(configuration, this))
             {
                 return decoder.Decode<TPixel>(stream);
             }
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoder.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoder.cs
new file mode 100644
index 000000000..37ce0151f
--- /dev/null
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoder.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.IO;
+using SixLabors.ImageSharp.PixelFormats;
+
+namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
+{
+    /// <summary>
+    /// Image decoder for generating an image out of a jpg stream.
+    /// </summary>
+    internal sealed class PdfJsJpegDecoder : IImageDecoder, IJpegDecoderOptions
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether the metadata should be ignored when the image is being decoded.
+        /// </summary>
+        public bool IgnoreMetadata { get; set; }
+
+        /// <inheritdoc/>
+        public Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            Guard.NotNull(stream, nameof(stream));
+
+            using (var decoder = new PdfJsJpegDecoderCore(configuration, this))
+            {
+                return decoder.Decode<TPixel>(stream);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index 30c245d81..dd876a7a4 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -70,7 +70,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
         private static IImageDecoder OrigJpegDecoder => new OrigJpegDecoder();
 
-        private static IImageDecoder PdfJsJpegDecoder => new JpegDecoder();
+        private static IImageDecoder PdfJsJpegDecoder => new PdfJsJpegDecoder();
         
         [Fact]
         public void ParseStream_BasicPropertiesAreCorrect1_PdfJs()