3 files changed, 36 insertions, 26 deletions
diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs
index 50e704060..e7c2cd255 100644
--- a/MediaBrowser.Providers/Manager/ImageSaver.cs
+++ b/MediaBrowser.Providers/Manager/ImageSaver.cs
@@ -264,7 +264,8 @@ namespace MediaBrowser.Providers.Manager
                 var fileStreamOptions = AsyncFile.WriteOptions;
                 fileStreamOptions.Mode = FileMode.Create;
                 fileStreamOptions.PreallocationSize = source.Length;
-                await using (var fs = new FileStream(path, fileStreamOptions))
+                var fs = new FileStream(path, fileStreamOptions);
+                await using (fs.ConfigureAwait(false))
                 {
                     await source.CopyToAsync(fs, cancellationToken).ConfigureAwait(false);
                 }
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
index a0f48840e..d621555f1 100644
--- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs
+++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
@@ -502,15 +502,17 @@ namespace MediaBrowser.Providers.Manager
                         break;
                     }
 
-                    await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
-
-                    await _providerManager.SaveImage(
-                        item,
-                        stream,
-                        response.Content.Headers.ContentType?.MediaType,
-                        type,
-                        null,
-                        cancellationToken).ConfigureAwait(false);
+                    var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+                    await using (stream.ConfigureAwait(false))
+                    {
+                        await _providerManager.SaveImage(
+                            item,
+                            stream,
+                            response.Content.Headers.ContentType?.MediaType,
+                            type,
+                            null,
+                            cancellationToken).ConfigureAwait(false);
+                    }
 
                     result.UpdateType |= ItemUpdateType.ImageUpdate;
                     return true;
@@ -626,14 +628,18 @@ namespace MediaBrowser.Providers.Manager
                         }
                     }
 
-                    await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
-                    await _providerManager.SaveImage(
-                        item,
-                        stream,
-                        response.Content.Headers.ContentType?.MediaType,
-                        imageType,
-                        null,
-                        cancellationToken).ConfigureAwait(false);
+                    var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+                    await using (stream.ConfigureAwait(false))
+                    {
+                        await _providerManager.SaveImage(
+                            item,
+                            stream,
+                            response.Content.Headers.ContentType?.MediaType,
+                            imageType,
+                            null,
+                            cancellationToken).ConfigureAwait(false);
+                    }
+
                     result.UpdateType |= ItemUpdateType.ImageUpdate;
                 }
                 catch (HttpRequestException)
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 914da33a9..0ce696edc 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -182,14 +182,17 @@ namespace MediaBrowser.Providers.Manager
                 contentType = MimeTypes.GetMimeType(url);
             }
 
-            await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
-            await SaveImage(
-                item,
-                stream,
-                contentType,
-                type,
-                imageIndex,
-                cancellationToken).ConfigureAwait(false);
+            var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+            await using (stream.ConfigureAwait(false))
+            {
+                await SaveImage(
+                    item,
+                    stream,
+                    contentType,
+                    type,
+                    imageIndex,
+                    cancellationToken).ConfigureAwait(false);
+            }
         }
 
         /// <inheritdoc/>