diff --git a/tasks/task_database.c b/tasks/task_database.c
index 9e4ddde500..6e985e9a69 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -131,8 +131,6 @@ void rarch_main_data_db_iterate(bool is_thread, void *data)
 
    switch (db->status)
    {
-      case DATABASE_STATUS_NONE:
-         break;
       case DATABASE_STATUS_ITERATE:
          database_info_iterate(db);
          break;
@@ -140,6 +138,9 @@ void rarch_main_data_db_iterate(bool is_thread, void *data)
          database_info_free(db);
          db = NULL;
          break;
+      default:
+      case DATABASE_STATUS_NONE:
+         break;
    }
 }
 #endif