diff --git a/packages/shiki/shiki.server.tsx b/packages/shiki/shiki.server.tsx
index c736044b..ca67623f 100644
--- a/packages/shiki/shiki.server.tsx
+++ b/packages/shiki/shiki.server.tsx
@@ -16,6 +16,10 @@ export const ShikiRender: FC<ShikiCodeProps> = async ({
 }) => {
   const highlighter = await createHighlighter()
 
+  if (!Object.keys(bundledLanguages).includes(language || "")) {
+    language = "text"
+  }
+
   const rendered = highlighter.codeToHtml(code, {
     lang: language || "text",
     themes: codeTheme || {
diff --git a/src/components/ui/ShikiRemark.tsx b/src/components/ui/ShikiRemark.tsx
index 0924a22a..c5307057 100644
--- a/src/components/ui/ShikiRemark.tsx
+++ b/src/components/ui/ShikiRemark.tsx
@@ -30,7 +30,7 @@ const pickCodeLanguage = (props: any) => {
       ? (props.children.props.className as string)
       : ""
 
-  if (className.includes("language-")) {
+  if (className?.includes("language-")) {
     return className.replace("language-", "")
   }
   return ""