diff --git a/frontend/src/components/RouteState.tsx b/frontend/src/components/RouteState.tsx
index f470593..b7d55a0 100644
--- a/frontend/src/components/RouteState.tsx
+++ b/frontend/src/components/RouteState.tsx
@@ -39,6 +39,8 @@ interface RouteStateProps {
   onRetry?: () => void
   retrying?: boolean
   testId?: string
+  /** Optional override for the Retry button's data-testid (defaults to none). */
+  retryTestId?: string
   className?: string
   /** Optional availability strip (stale/limited/partial) above the state body. */
   availability?: DataAvailability
@@ -72,6 +74,7 @@ export function RouteState({
   onRetry,
   retrying = false,
   testId,
+  retryTestId,
   className = '',
   availability,
   children,
@@ -113,6 +116,7 @@ export function RouteState({
               onClick={onRetry}
               disabled={retrying}
               aria-busy={retrying || undefined}
+              data-testid={retryTestId}
             >
               {retrying ? 'Retrying…' : 'Retry'}
             </button>
diff --git a/frontend/src/pages/RaceHubPage.tsx b/frontend/src/pages/RaceHubPage.tsx
index 2e3ae7f..1733017 100644
--- a/frontend/src/pages/RaceHubPage.tsx
+++ b/frontend/src/pages/RaceHubPage.tsx
@@ -122,6 +122,7 @@ export function RaceHubPage({ sessionKey }: Props) {
               if (!contextQuery.isFetching) void contextQuery.refetch()
             }}
             retrying={contextQuery.isFetching}
+            retryTestId="rh-retry"
           >
             <div className="rh-recover-actions">
               <Link to="/" search={{}} className="rh-recover-btn" data-testid="rh-back-weekend">
@@ -212,6 +213,7 @@ export function RaceHubPage({ sessionKey }: Props) {
             if (!raceHubQuery.isFetching) void raceHubQuery.refetch()
           }}
           retrying={raceHubQuery.isFetching}
+          retryTestId="rh-retry"
         >
           <div className="rh-recover-actions">
             <Link
diff --git a/frontend/src/test/RaceHubPage.test.tsx b/frontend/src/test/RaceHubPage.test.tsx
index 4bd998b..8c0d967 100644
--- a/frontend/src/test/RaceHubPage.test.tsx
+++ b/frontend/src/test/RaceHubPage.test.tsx
@@ -384,7 +384,8 @@ describe('RaceHubPage', () => {
 
     renderRaceHub(0)
 
-    await waitFor(() => expect(mockFetchRaceHub).toHaveBeenCalledWith(9471))
+    await waitFor(() => expect(mockFetchRaceHub).toHaveBeenCalledWith(9471, expect.any(AbortSignal)))
+    expect(mockFetchRaceHub).not.toHaveBeenCalledWith(9600, expect.anything())
     expect(mockFetchRaceHub).not.toHaveBeenCalledWith(9600)
   })