diff --git a/tasks/task_database.c b/tasks/task_database.c
index 6a7b2c31ef..43cd82933d 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -122,6 +122,32 @@ static int database_info_iterate_start
    return 0;
 }
 
+static int iso_get_serial(database_state_handle_t *db_state,
+      database_info_handle_t *db, const char *name, char* serial)
+{
+   int rv;
+   int32_t offset = 0;
+   const char* system_name = NULL;
+
+   if ((rv = detect_system(name, offset, &system_name)) < 0)
+      return rv;
+
+   if (strcmp(system_name, "psp") == 0)
+   {
+      if (detect_psp_game(name, serial) == 0)
+         return 0;
+      RARCH_LOG("Found disk label '%s'\n", serial);
+   }
+   else if (strcmp(system_name, "ps1") == 0)
+   {
+      if (detect_ps1_game(name, serial) == 0)
+         return 0;
+      RARCH_LOG("Found disk label '%s'\n", serial);
+   }
+
+   return 0;
+}
+
 static int cue_get_serial(database_state_handle_t *db_state,
       database_info_handle_t *db, const char *name, char* serial)
 {
@@ -139,31 +165,7 @@ static int cue_get_serial(database_state_handle_t *db_state,
 
    RARCH_LOG("Reading 1st data track...\n");
 
-   if ((rv = detect_system(track_path, offset, &system_name)) < 0)
-      return rv;
-
-   RARCH_LOG("Detected %s media\n", system_name);
-
-   if (strcmp(system_name, "ps1") == 0)
-   {
-      if (detect_ps1_game(track_path, serial) == 0)
-         return 0;
-      RARCH_LOG("Found disk label '%s'\n", serial);
-   }
-
-   return 0;
-}
-
-static int iso_get_serial(database_state_handle_t *db_state,
-      database_info_handle_t *db, const char *name, char* serial)
-{
-   RARCH_LOG("Detected ISO image\n");
-
-   if (detect_psp_game(name, serial) == 0)
-      return 0;
-   RARCH_LOG("Found disk label '%s'\n", serial);
-
-   return 0;
+   return iso_get_serial(db_state, db, track_path, serial);
 }
 
 static int database_info_iterate_playlist(
diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c
index 2ad2f401df..d5fe6aa578 100644
--- a/tasks/task_database_cue.c
+++ b/tasks/task_database_cue.c
@@ -371,6 +371,18 @@ int detect_system(const char *track_path, int32_t offset,
       }
    }
 
+   retro_fseek(fd, 0x8008, SEEK_SET);
+   if (retro_fread(fd, magic, 8) > 0)
+   {
+      magic[8] = '\0';
+      if (!strcmp(magic, "PSP GAME"))
+      {
+         *system_name = "psp\0";
+         rv = 0;
+         goto clean;
+      }
+   }
+
    RARCH_LOG("Could not find compatible system\n");
    rv = -EINVAL;
 clean: