diff --git a/frontend/frontend.c b/frontend/frontend.c
index d3884f7860..c8acb753b0 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -273,7 +273,7 @@ static void check_defaults_dirs(void)
       path_mkdir(g_defaults.system_dir);
 }
 
-bool main_load_content(int argc, char **argv, environment_get_t environ_get,
+bool main_load_content(int argc, char **argv, args_type() args, environment_get_t environ_get,
       process_args_t process_args)
 {
    bool retval = true;
@@ -294,7 +294,7 @@ bool main_load_content(int argc, char **argv, environment_get_t environ_get,
    rarch_assert(wrap_args);
 
    if (environ_get)
-      environ_get(rarch_argc_ptr, rarch_argv_ptr, NULL, wrap_args);
+      environ_get(rarch_argc_ptr, rarch_argv_ptr, args, wrap_args);
 
    check_defaults_dirs();
 
@@ -344,7 +344,7 @@ returntype main_entry(signature())
 
    rarch_main_clear_state();
 
-   if (!(ret = (main_load_content(argc, argv, driver.frontend_ctx->environment_get,
+   if (!(ret = (main_load_content(argc, argv, args, driver.frontend_ctx->environment_get,
          driver.frontend_ctx->process_args))))
       return_var(ret);
 
diff --git a/frontend/frontend.h b/frontend/frontend.h
index c1add009e1..08af5494d9 100644
--- a/frontend/frontend.h
+++ b/frontend/frontend.h
@@ -40,7 +40,7 @@ extern "C" {
 int main_entry_iterate(signature(), args_type() args);
 void main_exit(args_type() args);
 returntype main_entry(signature());
-bool main_load_content(int argc, char **argv, environment_get_t environ_get,
+bool main_load_content(int argc, char **argv, args_type() args, environment_get_t environ_get,
       process_args_t process_args);
 
 #ifdef __cplusplus
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 563ce87776..6342a5e5ae 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -197,7 +197,7 @@ bool load_menu_content(void)
 {
    load_menu_content_prepare();
 
-   if (!(main_load_content(0, NULL, menu_environment_get,
+   if (!(main_load_content(0, NULL, NULL, menu_environment_get,
          driver.frontend_ctx->process_args)))
    {
       char name[PATH_MAX], msg[PATH_MAX];