2 files changed, 9 insertions, 3 deletions

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index fc122426a2..55e5b7991f 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -52,8 +52,8 @@ if(QT_VERSION_MAJOR EQUAL 5)
                  Core Widgets Svg Multimedia Network Test LinguistTools)
 else()
     find_package(Qt6 REQUIRED COMPONENTS
-                 Core Core5Compat Widgets Svg Multimedia Network LinguistTools SvgWidgets
-                 OPTIONAL_COMPONENTS Test)
+                 Core Core5Compat Widgets Svg Network LinguistTools SvgWidgets
+                 OPTIONAL_COMPONENTS Multimedia Test)
 endif()
 get_target_property(_moc_executable Qt${QT_VERSION_MAJOR}::moc IMPORTED_LOCATION)
 get_filename_component(QT_BINDIR "${_moc_executable}" DIRECTORY)
diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt
index 2a439340b3..41954cb9ee 100644
--- a/utils/rbutilqt/CMakeLists.txt
+++ b/utils/rbutilqt/CMakeLists.txt
@@ -125,8 +125,14 @@ if(APPLE)
 endif()
 
 target_link_libraries(RockboxUtility rbbase cutelogger gitversion
-    Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Multimedia
+    Qt${QT_VERSION_MAJOR}::Widgets
     Qt${QT_VERSION_MAJOR}::Svg)
+
+if (TARGET Qt${QT_VERSION_MAJOR}::Multimedia) # optional
+    target_link_libraries(RockboxUtility
+        Qt${QT_VERSION_MAJOR}::Multimedia)
+endif()
+
 if(QT_VERSION_MAJOR EQUAL 6)
     target_link_libraries(RockboxUtility Qt${QT_VERSION_MAJOR}::SvgWidgets)
 endif()