diff --git a/command.c b/command.c
index ac088b7fdb..7f281ba546 100644
--- a/command.c
+++ b/command.c
@@ -1805,6 +1805,7 @@ bool command_event(enum event_command cmd, void *data)
       case CMD_EVENT_LOAD_CORE_PERSIST:
          {
 #ifdef HAVE_MENU
+            path_clear_all();
             core_info_ctx_find_t info_find;
             rarch_system_info_t *system_info = runloop_get_system_info();
             struct retro_system_info *system = &system_info->info;
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 9877d6b375..0c8f0b4129 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -173,27 +173,21 @@ static void content_load_init_wrap(
    *argc = 0;
    argv[(*argc)++] = strdup("retroarch");
 
-#ifdef HAVE_DYNAMIC
-   if (!args->no_content)
+   if (args->content_path)
    {
-#endif
-      if (args->content_path)
-      {
-         RARCH_LOG("Using content: %s.\n", args->content_path);
-         argv[(*argc)++] = strdup(args->content_path);
-      }
+      RARCH_LOG("Using content: %s.\n", args->content_path);
+      argv[(*argc)++] = strdup(args->content_path);
+   }
 #ifdef HAVE_MENU
-      else
-      {
-         RARCH_LOG("%s\n",
-               msg_hash_to_str(MSG_NO_CONTENT_STARTING_DUMMY_CORE));
-         argv[(*argc)++] = strdup("--menu");
-      }
-#endif
-#ifdef HAVE_DYNAMIC
+   else
+   {
+      RARCH_LOG("%s\n",
+            msg_hash_to_str(MSG_NO_CONTENT_STARTING_DUMMY_CORE));
+      argv[(*argc)++] = strdup("--menu");
    }
 #endif
 
+
    if (args->sram_path)
    {
       argv[(*argc)++] = strdup("-s");