diff --git a/src/assets/png/Backgrounds/index.ts b/src/assets/png/Backgrounds/index.ts
index f5eb860..0d509aa 100644
--- a/src/assets/png/Backgrounds/index.ts
+++ b/src/assets/png/Backgrounds/index.ts
@@ -8,13 +8,13 @@ const BACKGROUND_IMAGES: Record<string, string> = {
   "Bg Deep 2": bgDeep2,
 };
 
-export function getBackgroundImage(name?: string): string | undefined {
+export function getBackgroundImage(name?: string): string | null {
   if (!name) return BACKGROUND_IMAGES["Bg Ocean"];
 
   const img = BACKGROUND_IMAGES[name];
   if (!img) {
     console.warn(`[FishTank] Unknown background name: ${name}`);
-    return BACKGROUND_IMAGES["Bg Ocean"];
+    return null;
   }
   return img;
 }
diff --git a/src/components/TankRenderer/AquariumPreview.tsx b/src/components/TankRenderer/AquariumPreview.tsx
index 95f4494..5bf2835 100644
--- a/src/components/TankRenderer/AquariumPreview.tsx
+++ b/src/components/TankRenderer/AquariumPreview.tsx
@@ -58,12 +58,16 @@ export default function AquariumPreview({
         const speciesKey = `${fish.group_code}_${fish.maturity}`;
         const svgSource = getFishSpriteSvg(speciesKey);
 
+        const repoLabel = fish.repository_name?.includes("/")
+          ? fish.repository_name.split("/").pop()!
+          : fish.repository_name;
+
         return (
           <FishSprite
             key={fish.id}
             id={String(fish.id)}
             svgSource={svgSource}
-            topLabel={fish.repository_name}
+            topLabel={repoLabel}
             bottomLabel={`${fish.commit_count} commits`}
             personaWidthPercent={10}
           />