diff --git a/tasks/task_database.c b/tasks/task_database.c
index d5e469b5a4..d301fb064c 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -81,11 +81,11 @@ static int task_database_iterate_start(database_info_handle_t *db,
 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;
+   int32_t offset          = 0;
    const char* system_name = NULL;
+   int                 rv  = detect_system(name, offset, &system_name);
 
-   if ((rv = detect_system(name, offset, &system_name)) < 0)
+   if (rv < 0)
       return rv;
 
    if (string_is_equal(system_name, "psp"))