diff --git a/server/utils/mdKit.ts b/server/utils/mdKit.ts
index 8150de86ad..dc020a242d 100644
--- a/server/utils/mdKit.ts
+++ b/server/utils/mdKit.ts
@@ -59,7 +59,8 @@ export async function createCodeHighlighter(): Promise<RendererApi['code']> {
 
   // Syntax highlighting for code blocks (uses shared highlighter)
   return ({ text, lang }: Tokens.Code) => {
-    const html = highlightCodeSync(shiki, text, lang || 'text')
+    const language = (lang || '').match(/^\S+/)?.[0] || 'text'
+    const html = highlightCodeSync(shiki, text, language)
     // Add copy button
     return `<div class="readme-code-block" >
   <button type="button" class="readme-copy-button" aria-label="Copy code" check-icon="i-lucide:check" copy-icon="i-lucide:copy" data-copy>
diff --git a/test/unit/server/utils/readme.spec.ts b/test/unit/server/utils/readme.spec.ts
index 6126f2f4fa..b330070094 100644
--- a/test/unit/server/utils/readme.spec.ts
+++ b/test/unit/server/utils/readme.spec.ts
@@ -808,6 +808,13 @@ describe('HTML output', () => {
     expect(result.html).not.toContain('rel="bookmark"')
     expect(result.html).not.toContain('target="_self"')
   })
+
+  it('only uses the first word of a fenced code info string as its language', async () => {
+    const markdown = '```ts second-word\nconst value = 1\n```'
+    const result = await renderReadmeHtml(markdown, 'test-pkg')
+
+    expect(result.html).toContain('<code class="language-ts">')
+  })
 })
 
 /**