diff --git a/src/app/api/tankopedia/route.ts b/src/app/api/tankopedia/route.ts
deleted file mode 100644
index 370ba2f7d..000000000
--- a/src/app/api/tankopedia/route.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { NextResponse } from 'next/server';
-import { tankopedia } from '../../../core/blitzkrieg/tankopedia';
-
-export async function GET() {
-  return NextResponse.json(await tankopedia);
-}
diff --git a/src/app/embeds/session/page.tsx b/src/app/embeds/session/page.tsx
index 0b4cc37f9..eb679bc74 100644
--- a/src/app/embeds/session/page.tsx
+++ b/src/app/embeds/session/page.tsx
@@ -295,7 +295,11 @@ export default function SessionPage() {
                   <Breakdown.Row
                     key={stats.tank_id}
                     minimized={!session.showCareer}
-                    title={tankopedia?.name ?? `Unknown tank ${stats.tank_id}`}
+                    title={
+                      tankopedia?.name_short ??
+                      tankopedia?.name ??
+                      `Unknown tank ${stats.tank_id}`
+                    }
                     type="tank"
                     tankType={tankopedia?.type}
                     treeType={(() => {
diff --git a/src/core/blitz/resolveTankName.ts b/src/core/blitz/resolveTankName.ts
index 8dfc2ac28..c0760926a 100644
--- a/src/core/blitz/resolveTankName.ts
+++ b/src/core/blitz/resolveTankName.ts
@@ -1,6 +1,8 @@
 import { tankopedia } from '../blitzkrieg/tankopedia';
 
 export default async function resolveTankName(tankId: number) {
-  const tankopediaName = (await tankopedia)[tankId]?.name;
-  return tankopediaName ? tankopediaName : `Unknown Tank ${tankId}`;
+  const awaitedTankopedia = await tankopedia;
+  const entry = awaitedTankopedia[tankId];
+
+  return entry?.name_short ?? entry?.name ?? `Unknown Tank ${tankId}`;
 }