diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index d86218d46d..6b0d8a2f08 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -499,11 +499,14 @@ void menu_init(void)
 
    // TODO: Should make history path configurable.
    // Possibly size as well.
-   char history_path[PATH_MAX];
-   fill_pathname_resolve_relative(history_path, g_extern.config_path,
-         ".retroarch-history.txt", sizeof(history_path));
-   RARCH_LOG("[RGUI]: Opening history: %s.\n", history_path);
-   rgui->history = rom_history_init(history_path, 20);
+   if (*g_extern.config_path)
+   {
+      char history_path[PATH_MAX];
+      fill_pathname_resolve_relative(history_path, g_extern.config_path,
+            ".retroarch-history.txt", sizeof(history_path));
+      RARCH_LOG("[RGUI]: Opening history: %s.\n", history_path);
+      rgui->history = rom_history_init(history_path, 20);
+   }
 }
 
 void menu_free(void)
diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index d058297ef2..0a8c36f7ec 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -1109,7 +1109,8 @@ static void rgui_settings_populate_entries(rgui_handle_t *rgui)
    rgui_list_push(rgui->selection_buf, "Core", RGUI_SETTINGS_CORE, 0);
 #endif
    rgui_list_push(rgui->selection_buf, "Core Options", RGUI_SETTINGS_CORE_OPTIONS, 0);
-   rgui_list_push(rgui->selection_buf, "Load Game (History)", RGUI_SETTINGS_OPEN_HISTORY, 0);
+   if (rgui->history)
+      rgui_list_push(rgui->selection_buf, "Load Game (History)", RGUI_SETTINGS_OPEN_HISTORY, 0);
    rgui_list_push(rgui->selection_buf, "Load Game", RGUI_SETTINGS_OPEN_FILEBROWSER, 0);
    rgui_list_push(rgui->selection_buf, "Video Options", RGUI_SETTINGS_VIDEO_OPTIONS, 0);