diff --git a/src/llama.cpp b/src/llama.cpp
index a7555d937..8cd630aeb 100644
--- a/src/llama.cpp
+++ b/src/llama.cpp
@@ -21734,7 +21734,7 @@ static int32_t llama_chat_apply_template_internal(
         if (add_ass) {
             ss << "[|assistant|]";
         }
-    } else if (tmpl == "rwkv-world" || tmpl_contains("'User: ' + message['content'] + '\n\nAssistant:'")) {
+    } else if (tmpl == "rwkv-world" || tmpl_contains("rwkv-world") || tmpl_contains("'User: ' + message['content'] + '\n\nAssistant:'")) {
         for (auto message : chat) {
             std::string role(message->role);
             if (role == "user") {