diff --git a/kcpp_adapters/AutoGuess.json b/kcpp_adapters/AutoGuess.json
index d65b4e8e0..1f11a5a62 100644
--- a/kcpp_adapters/AutoGuess.json
+++ b/kcpp_adapters/AutoGuess.json
@@ -112,10 +112,11 @@
         "assistant_end": "</s>"
     }
 }, {
-    "search": ["<|system|>", "<|user|>","[gMASK]"],
+    "search": ["[gMASK]<sop>"],
     "name": "GLM-4",
     "adapter": {
-        "system_start": "[gMASK]<sop><|system|>\n",
+        "chat_start": "[gMASK]<sop>",
+        "system_start": "<|system|>\n",
         "system_end": "",
         "user_start": "<|user|>\n",
         "user_end": "",
diff --git a/koboldcpp.py b/koboldcpp.py
index cc5765043..5535cea16 100644
--- a/koboldcpp.py
+++ b/koboldcpp.py
@@ -2049,7 +2049,7 @@ def transform_genparams(genparams, api_format):
         if api_format==4 or api_format==7: #handle ollama chat here too
             # translate openai chat completion messages format into one big string.
             messages_array = genparams.get('messages', [])
-            messages_string = ""
+            messages_string = adapter_obj.get("chat_start", "")
             system_message_start = adapter_obj.get("system_start", "\n### Instruction:\n")
             system_message_end = adapter_obj.get("system_end", "")
             user_message_start = adapter_obj.get("user_start", "\n### Instruction:\n")