diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79ca6c62b..4f04955c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -296,7 +296,9 @@ if(UNIX AND NOT APPLE)
 endif()
 
 if(MSVC)
-  set(HAVE_WINDOWS_MEDIA_CONTROLS ON)
+  optional_component(WINDOWS_MEDIA_CONTROLS ON "Windows Media Transport Controls"
+    DEPENDS "MSVC compiler" MSVC
+  )
 endif()
 
 optional_component(SONGFINGERPRINTING ON "Song fingerprinting and tracking"
diff --git a/src/core/windowsmediacontroller.cpp b/src/core/windowsmediacontroller.cpp
index b60153967..f8c102293 100644
--- a/src/core/windowsmediacontroller.cpp
+++ b/src/core/windowsmediacontroller.cpp
@@ -246,7 +246,7 @@ void WindowsMediaController::AlbumCoverLoaded(const Song &song, const AlbumCover
   }
 
   // Update metadata with album cover
-  UpdateMetadata(song, result.temp_cover_url.isEmpty() ? result.cover_url : result.temp_cover_url);
+  UpdateMetadata(song, result.temp_cover_url.isEmpty() ? result.album_cover.cover_url : result.temp_cover_url);
 }
 
 void WindowsMediaController::UpdateMetadata(const Song &song, const QUrl &art_url) {