diff --git a/src/app/(home)/admin/stream/obs-control-panel/_components/obs-control-panel-client.tsx b/src/app/(home)/admin/stream/obs-control-panel/_components/obs-control-panel-client.tsx
index 383232f..7dc7488 100644
--- a/src/app/(home)/admin/stream/obs-control-panel/_components/obs-control-panel-client.tsx
+++ b/src/app/(home)/admin/stream/obs-control-panel/_components/obs-control-panel-client.tsx
@@ -56,7 +56,7 @@ export function ObsControlPanelClient() {
     channel_id: RANKED_CHANNEL,
   })
 
-  const playersForSelect = players.data?.map((player) => ({
+  const playersForSelect = players.data?.data?.map((player) => ({
     value: player.id,
     label: player.name,
   }))
@@ -112,12 +112,12 @@ export function ObsControlPanelClient() {
   )
   const player1Data = useMemo(() => {
     return player1Info && player1Games
-      ? getPlayerData(player1Info, player1Games)
+      ? getPlayerData(player1Info.data, player1Games)
       : null
   }, [player1Info, player1Games])
   const player2Data = useMemo(() => {
     return player2Info && player2Games
-      ? getPlayerData(player2Info, player2Games)
+      ? getPlayerData(player2Info.data, player2Games)
       : null
   }, [player2Info, player2Games])
 
diff --git a/src/app/(home)/players/[id]/user.tsx b/src/app/(home)/players/[id]/user.tsx
index d0c1efd..24751b9 100644
--- a/src/app/(home)/players/[id]/user.tsx
+++ b/src/app/(home)/players/[id]/user.tsx
@@ -83,15 +83,16 @@ export function UserInfo() {
       channel_id: VANILLA_CHANNEL,
     }
   )
-  const [vanillaUserRank] = api.leaderboard.get_user_rank.useSuspenseQuery({
+  const [vanillaUserRankQ] = api.leaderboard.get_user_rank.useSuspenseQuery({
     channel_id: VANILLA_CHANNEL,
     user_id: id,
   })
-  const [rankedUserRank] = api.leaderboard.get_user_rank.useSuspenseQuery({
+  const [rankedUserRankQ] = api.leaderboard.get_user_rank.useSuspenseQuery({
     channel_id: RANKED_CHANNEL,
     user_id: id,
   })
-
+  const rankedUserRank = rankedUserRankQ?.data
+  const vanillaUserRank = vanillaUserRankQ?.data
   const filteredGamesByLeaderboard =
     leaderboardFilter === 'all'
       ? games
diff --git a/src/app/stream-card/[id]/_components/stream-card-client.tsx b/src/app/stream-card/[id]/_components/stream-card-client.tsx
index bb12904..3fb7b36 100644
--- a/src/app/stream-card/[id]/_components/stream-card-client.tsx
+++ b/src/app/stream-card/[id]/_components/stream-card-client.tsx
@@ -89,7 +89,7 @@ export function StreamCardClient() {
     return null
   }
 
-  const playerData = getPlayerData(rankedUserRank, games)
+  const playerData = getPlayerData(rankedUserRank?.data, games)
 
   const isQueuing = playerState?.status === 'queuing'
   const opponentId = playerState?.currentMatch?.opponentId
@@ -181,7 +181,8 @@ function Opponent({ id, wins }: { id: string; wins?: number }) {
     return null
   }
 
-  const playerData = getPlayerData(rankedUserRank, games)
+  const playerData = getPlayerData(rankedUserRank?.data, games)
+
   return <PlayerInfo playerData={playerData} isReverse isInBattle wins={wins} />
 }