diff --git a/src/daemon/meson.build b/src/daemon/meson.build
index 9adbb7784..fcab47d0f 100644
--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -40,8 +40,7 @@ endif
 if default_sm == ''
   summary({'No session manager': 'pw-uninstalled.sh will not work out of the box!'})
 elif default_sm == 'media-session'
-  conf_config_uninstalled.set('session_manager_path',
-    meson.build_root() / 'src' / 'media-session' / 'pipewire-media-session')
+  conf_config_uninstalled.set('session_manager_path', pipewire_media_session.full_path())
   conf_config_uninstalled.set('sm_comment', '')
 elif default_sm == 'wireplumber'
   wp_bindir = wp_proj.get_variable('wireplumber_bin_dir', pipewire_bindir)
diff --git a/src/meson.build b/src/meson.build
index ee083f319..1e45830d8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,9 +1,9 @@
 
 subdir('pipewire')
+subdir('media-session')
 subdir('daemon')
 subdir('tools')
 subdir('modules')
-subdir('media-session')
 if not get_option('examples').disabled()
   subdir('examples')
 endif