diff --git a/src/ImageSharp/Formats/ImageEncoderUtilities.cs b/src/ImageSharp/Formats/ImageEncoderUtilities.cs
index 29f0a14c3..6be58bce9 100644
--- a/src/ImageSharp/Formats/ImageEncoderUtilities.cs
+++ b/src/ImageSharp/Formats/ImageEncoderUtilities.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -21,16 +22,33 @@ namespace SixLabors.ImageSharp.Formats
             Configuration configuration = image.GetConfiguration();
             if (stream.CanSeek)
             {
-                encoder.Encode(image, stream, cancellationToken);
+                await DoEncodeAsync();
             }
             else
             {
                 using var ms = new MemoryStream();
-                encoder.Encode(image, ms, cancellationToken);
+                await DoEncodeAsync();
                 ms.Position = 0;
                 await ms.CopyToAsync(stream, configuration.StreamProcessingBufferSize, cancellationToken)
                     .ConfigureAwait(false);
             }
+
+            Task DoEncodeAsync()
+            {
+                try
+                {
+                    encoder.Encode(image, stream, cancellationToken);
+                    return Task.CompletedTask;
+                }
+                catch (OperationCanceledException)
+                {
+                    return Task.FromCanceled(cancellationToken);
+                }
+                catch (Exception ex)
+                {
+                    return Task.FromException(ex);
+                }
+            }
         }
 
         public static void Encode<TPixel>(
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
index 11d64e49f..981270a5f 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
@@ -310,7 +310,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             }
 
             var encoder = new JpegEncoder() { Subsample = subsample };
-            await Assert.ThrowsAnyAsync<OperationCanceledException>(() => image.SaveAsync(stream, encoder, cts.Token));
+            await Assert.ThrowsAsync<TaskCanceledException>(() => image.SaveAsync(stream, encoder, cts.Token));
         }
     }
 }