diff --git a/code/websites/pokedex.online/src/views/ChallongeTest.vue b/code/websites/pokedex.online/src/views/ChallongeTest.vue
index 54d4105..d157379 100644
--- a/code/websites/pokedex.online/src/views/ChallongeTest.vue
+++ b/code/websites/pokedex.online/src/views/ChallongeTest.vue
@@ -564,24 +564,20 @@ function getTournamentProp(tournament, prop) {
 }
 
 async function testListTournaments(resetPagination = true) {
-  loading.value = true;
-  error.value = null;
-
   if (resetPagination) {
     currentPage.value = 1;
-    tournaments.value = null;
     searchQuery.value = '';
     expandedTournamentId.value = null;
-    tournamentDetails.value = null;
+    tournamentDetailsState.reset();
   }
 
-  try {
+  await tournamentListState.execute(async () => {
     if (apiVersion.value === 'v1') {
       // v1 doesn't support pagination
       const result = await client.value.tournaments.list();
-      tournaments.value = result;
       totalTournaments.value = result.length;
       hasNextPage.value = false;
+      return result;
     } else {
       // v2.1 - Query all tournament states (pending, in_progress, ended) in parallel
       // USER scope returns tournaments you have access to:
@@ -622,15 +618,11 @@ async function testListTournaments(resetPagination = true) {
         results: result
       });
 
-      tournaments.value = result;
       totalTournaments.value = result.length;
       hasNextPage.value = result.length >= 100;
+      return result;
     }
-  } catch (err) {
-    handleError(err);
-  } finally {
-    loading.value = false;
-  }
+  });
 }
 
 async function loadMoreTournaments() {