diff --git a/crates/inference-server/src/compat.rs b/crates/inference-server/src/compat.rs
index 275ab07..1bb17da 100644
--- a/crates/inference-server/src/compat.rs
+++ b/crates/inference-server/src/compat.rs
@@ -442,7 +442,7 @@ fn select_chat_template(req: &ChatCompletionRequest, config: &ServerConfig) -> C
         if normalized.contains("llama") {
             return ChatTemplate::Llama;
         }
-        if normalized.contains("kimi") {
+        if normalized.contains("kimi") || normalized.contains("moonshot") {
             return ChatTemplate::Kimi;
         }
     }