diff --git a/player/configfiles.c b/player/configfiles.c
index 37cf76b5fc..65e402b184 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -62,7 +62,8 @@ bool mp_parse_cfgfiles(struct MPContext *mpctx)
         m_config_parse_config_file(mpctx->mconfig, conffile, 0);
 #endif
 
-    if (m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mpv.conf", 0) < 0) {
+    conffile = mp_find_global_config_file(tmp, mpctx->global, "mpv.conf");
+    if (conffile && m_config_parse_config_file(conf, conffile, 0) < 0) {
         r = false;
         goto done;
     }