diff --git a/src/ImageSharp/Advanced/AotCompilerTools.cs b/src/ImageSharp/Advanced/AotCompilerTools.cs
index ea4cd1c8c4..b61e63a53d 100644
--- a/src/ImageSharp/Advanced/AotCompilerTools.cs
+++ b/src/ImageSharp/Advanced/AotCompilerTools.cs
@@ -7,6 +7,7 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Bmp;
+using SixLabors.ImageSharp.Formats.Experimental.Webp;
 using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Jpeg.Components;
@@ -194,6 +195,7 @@ namespace SixLabors.ImageSharp.Advanced
         private static void AotCompileImageEncoderInternals<TPixel>()
             where TPixel : unmanaged, IPixel<TPixel>
         {
+            default(WebpEncoderCore).Encode<TPixel>(default, default, default);
             default(BmpEncoderCore).Encode<TPixel>(default, default, default);
             default(GifEncoderCore).Encode<TPixel>(default, default, default);
             default(JpegEncoderCore).Encode<TPixel>(default, default, default);
@@ -209,6 +211,7 @@ namespace SixLabors.ImageSharp.Advanced
         private static void AotCompileImageDecoderInternals<TPixel>()
             where TPixel : unmanaged, IPixel<TPixel>
         {
+            default(WebpDecoderCore).Decode<TPixel>(default, default, default);
             default(BmpDecoderCore).Decode<TPixel>(default, default, default);
             default(GifDecoderCore).Decode<TPixel>(default, default, default);
             default(JpegDecoderCore).Decode<TPixel>(default, default, default);
@@ -224,6 +227,7 @@ namespace SixLabors.ImageSharp.Advanced
         private static void AotCompileImageEncoders<TPixel>()
            where TPixel : unmanaged, IPixel<TPixel>
         {
+            AotCompileImageEncoder<TPixel, WebpEncoder>();
             AotCompileImageEncoder<TPixel, BmpEncoder>();
             AotCompileImageEncoder<TPixel, GifEncoder>();
             AotCompileImageEncoder<TPixel, JpegEncoder>();
@@ -239,6 +243,7 @@ namespace SixLabors.ImageSharp.Advanced
         private static void AotCompileImageDecoders<TPixel>()
             where TPixel : unmanaged, IPixel<TPixel>
         {
+            AotCompileImageDecoder<TPixel, WebpDecoder>();
             AotCompileImageDecoder<TPixel, BmpDecoder>();
             AotCompileImageDecoder<TPixel, GifDecoder>();
             AotCompileImageDecoder<TPixel, JpegDecoder>();
diff --git a/src/ImageSharp/Formats/WebP/WebpEncoder.cs b/src/ImageSharp/Formats/WebP/WebpEncoder.cs
index 88bceddb28..5d86af7ee1 100644
--- a/src/ImageSharp/Formats/WebP/WebpEncoder.cs
+++ b/src/ImageSharp/Formats/WebP/WebpEncoder.cs
@@ -43,7 +43,7 @@ namespace SixLabors.ImageSharp.Formats.Experimental.Webp
             where TPixel : unmanaged, IPixel<TPixel>
         {
             var encoder = new WebpEncoderCore(this, image.GetMemoryAllocator());
-            return encoder.EncodeAsync(image, stream);
+            return encoder.EncodeAsync(image, stream, cancellationToken);
         }
     }
 }
diff --git a/src/ImageSharp/Formats/WebP/WebpEncoderCore.cs b/src/ImageSharp/Formats/WebP/WebpEncoderCore.cs
index 2ff6c6001b..075f8f53ea 100644
--- a/src/ImageSharp/Formats/WebP/WebpEncoderCore.cs
+++ b/src/ImageSharp/Formats/WebP/WebpEncoderCore.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 
 using SixLabors.ImageSharp.Formats.Experimental.Webp.Lossless;
@@ -14,7 +15,7 @@ namespace SixLabors.ImageSharp.Formats.Experimental.Webp
     /// <summary>
     /// Image encoder for writing an image to a stream in the WebP format.
     /// </summary>
-    internal sealed class WebpEncoderCore
+    internal sealed class WebpEncoderCore : IImageEncoderInternals
     {
         /// <summary>
         /// Used for allocating memory during processing operations.
@@ -68,7 +69,8 @@ namespace SixLabors.ImageSharp.Formats.Experimental.Webp
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="image">The <see cref="ImageFrame{TPixel}"/> to encode from.</param>
         /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
-        public void Encode<TPixel>(Image<TPixel> image, Stream stream)
+        /// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
+        public void Encode<TPixel>(Image<TPixel> image, Stream stream, CancellationToken cancellationToken)
             where TPixel : unmanaged, IPixel<TPixel>
         {
             Guard.NotNull(image, nameof(image));
@@ -92,12 +94,13 @@ namespace SixLabors.ImageSharp.Formats.Experimental.Webp
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="image">The <see cref="ImageFrame{TPixel}"/> to encode from.</param>
         /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
-        public async Task EncodeAsync<TPixel>(Image<TPixel> image, Stream stream)
+        /// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
+        public async Task EncodeAsync<TPixel>(Image<TPixel> image, Stream stream, CancellationToken cancellationToken)
             where TPixel : unmanaged, IPixel<TPixel>
         {
             if (stream.CanSeek)
             {
-                this.Encode(image, stream);
+                this.Encode(image, stream, cancellationToken);
             }
             else
             {
@@ -105,7 +108,7 @@ namespace SixLabors.ImageSharp.Formats.Experimental.Webp
                 {
                     this.Encode(image, ms);
                     ms.Position = 0;
-                    await ms.CopyToAsync(stream).ConfigureAwait(false);
+                    await ms.CopyToAsync(stream, cancellationToken).ConfigureAwait(false);
                 }
             }
         }