diff --git a/frontend/hooks/data/useTournamentData.ts b/frontend/hooks/data/useTournamentData.ts
index c1174f360..283cbc547 100644
--- a/frontend/hooks/data/useTournamentData.ts
+++ b/frontend/hooks/data/useTournamentData.ts
@@ -4,9 +4,9 @@ import { useRouter } from "next/dist/client/router";
 export function useTournamentData() {
   const router = useRouter();
   const { tournament } = router.query;
-  // TODO: as
   const [result] = useTournamentByIdentifierQuery({
-    variables: { identifier: tournament as string },
+    variables: { identifier: typeof tournament === "string" ? tournament : "" },
+    pause: typeof tournament !== "string",
   });
 
   return result;
diff --git a/frontend/pages/o/[organization]/[tournament].tsx b/frontend/pages/to/[tournament].tsx
similarity index 100%
rename from frontend/pages/o/[organization]/[tournament].tsx
rename to frontend/pages/to/[tournament].tsx