diff --git a/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor b/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
index 7352b35..f5a95aa 100644
--- a/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
+++ b/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
@@ -79,6 +79,18 @@
                                                aria-label="Clear cover art" />
                             </MudStack>
                         }
+                        else if (_selectedImageFile is not null)
+                        {
+                            <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
+                                <MudText Typo="Typo.body2" Color="Color.Default">New image selected (not yet saved).</MudText>
+                                <MudIconButton Icon="@Icons.Material.Filled.Clear"
+                                               Color="Color.Error"
+                                               Size="Size.Small"
+                                               Disabled="_busy"
+                                               OnClick="ClearImage"
+                                               aria-label="Cancel image selection" />
+                            </MudStack>
+                        }
                         else
                         {
                             <MudText Typo="Typo.body2" Color="Color.Default">No cover art set.</MudText>
diff --git a/DeepDrftManager/Services/CmsTrackService.cs b/DeepDrftManager/Services/CmsTrackService.cs
index 12a314e..c6fb909 100644
--- a/DeepDrftManager/Services/CmsTrackService.cs
+++ b/DeepDrftManager/Services/CmsTrackService.cs
@@ -241,16 +241,26 @@ public class CmsTrackService : ICmsTrackService
         }
     }
 
+    private static readonly HashSet<string> KnownImageMimeTypes = new(StringComparer.OrdinalIgnoreCase)
+    {
+        "image/jpeg", "image/png", "image/gif", "image/webp", "image/svg+xml", "image/bmp"
+    };
+
     public async Task<ResultContainer<string>> UploadImageAsync(
         Stream imageStream,
         string fileName,
         string contentType,
         CancellationToken ct = default)
     {
+        if (string.IsNullOrWhiteSpace(contentType) || !KnownImageMimeTypes.Contains(contentType))
+        {
+            _logger.LogWarning("UploadImageAsync rejected: unsupported or missing content type '{ContentType}'", contentType);
+            return ResultContainer<string>.CreateFailResult($"Unsupported image type: {contentType}. Accepted: JPEG, PNG, GIF, WebP, SVG, BMP.");
+        }
+
         using var multipart = new MultipartFormDataContent();
         var imageContent = new StreamContent(imageStream);
-        imageContent.Headers.ContentType = new MediaTypeHeaderValue(
-            string.IsNullOrWhiteSpace(contentType) ? "application/octet-stream" : contentType);
+        imageContent.Headers.ContentType = new MediaTypeHeaderValue(contentType);
         multipart.Add(imageContent, "image", fileName);
 
         var client = _httpClientFactory.CreateClient(ContentCmsClientName);