diff --git a/projects/backend/src/service/beatsaver.service.ts b/projects/backend/src/service/beatsaver.service.ts
index 9ff910f..2537a16 100644
--- a/projects/backend/src/service/beatsaver.service.ts
+++ b/projects/backend/src/service/beatsaver.service.ts
@@ -33,6 +33,9 @@ export default class BeatSaverService {
             unknownMap: true,
           }
     );
+    if (map.unknownMap) {
+      return undefined;
+    }
     return map.toObject() as BeatSaverMap;
   }
 }
diff --git a/projects/website/src/components/player/player-stats.tsx b/projects/website/src/components/player/player-stats.tsx
index 41f382c..8f4b36d 100644
--- a/projects/website/src/components/player/player-stats.tsx
+++ b/projects/website/src/components/player/player-stats.tsx
@@ -93,7 +93,7 @@ export default function PlayerStats({ player }: Props) {
         const stat = <StatValue key={index} color={badge.color} name={badge.name} value={value} />;
 
         return tooltip ? (
-          <Tooltip asChild={false} display={tooltip}>
+          <Tooltip asChild={false} display={tooltip} key={index}>
             {stat}
           </Tooltip>
         ) : (