diff --git a/common/chat.cpp b/common/chat.cpp
index 8a04b251a..1687322c1 100644
--- a/common/chat.cpp
+++ b/common/chat.cpp
@@ -1041,7 +1041,7 @@ common_chat_params common_chat_params_init(const common_chat_template & tmpl, co
 
     // Use generic handler when forcing thoughts or JSON schema for final output
     // TODO: support thinking mode and/or JSON schema in handlers below this.
-    if (inputs.think || inputs.json_schema.is_object()) {
+    if (inputs.think || !inputs.tools.is_null() && inputs.json_schema.is_object()) {
         return common_chat_params_init_generic(tmpl, inputs);
     }
 
diff --git a/examples/server/tests/unit/test_tool_call.py b/examples/server/tests/unit/test_tool_call.py
index 937169d4b..538b42fea 100644
--- a/examples/server/tests/unit/test_tool_call.py
+++ b/examples/server/tests/unit/test_tool_call.py
@@ -440,14 +440,13 @@ def test_calc_result(result_override: str | None, n_predict: int, hf_repo: str,
 
 @pytest.mark.slow
 @pytest.mark.parametrize("n_predict,think,expect_content,expect_reasoning_content,hf_repo,template_override", [
-    (1024, True,  "^The sum of 102 and 7 is 109.*",                    "^The user's request is straightforward.*",    "bartowski/Phi-3.5-mini-instruct-GGUF:Q4_K_M",       None),
-    (128,  False, "^The sum of 102 and 7 is 109.*",                    None,                                          "bartowski/Phi-3.5-mini-instruct-GGUF:Q4_K_M",       None),
+    (1024, True,  "^The sum of 102 and 7 is 109.*",                       "^The user's request is straightforward.*",    "bartowski/Phi-3.5-mini-instruct-GGUF:Q4_K_M",       None),
+    (128,  False, "^The sum of 102 and 7 is 109.*",                       None,                                          "bartowski/Phi-3.5-mini-instruct-GGUF:Q4_K_M",       None),
 
-    (1024, True, "To find the sum of.*",                               "I need to calculate the sum of 102 and 7.*",  "bartowski/DeepSeek-R1-Distill-Qwen-7B-GGUF:Q4_K_M", None),
-    (1024, False, "<think>\nI need[\\s\\S\\r\\n]*</think>\nTo find",   None,                                          "bartowski/DeepSeek-R1-Distill-Qwen-7B-GGUF:Q4_K_M", None),
+    (1024, True, "To find the sum of.*",                                  "I need to calculate the sum of 102 and 7.*",  "bartowski/DeepSeek-R1-Distill-Qwen-7B-GGUF:Q4_K_M", None),
+    (1024, False, "<think>\nI need[\\s\\S\\r\\n]*?</think>\nTo find.*",   None,                                          "bartowski/DeepSeek-R1-Distill-Qwen-7B-GGUF:Q4_K_M", None),
 
-    (1024, True, "To find the sum of.*",                               "First, I need to add the tens place.*",       "bartowski/DeepSeek-R1-Distill-Qwen-7B-GGUF:Q4_K_M", ("llama-cpp-deepseek-r1", None)),
-    (1024, False, "<think>\nI need[\\s\\S\\r\\n]*</think>To find",     None,                                          "bartowski/DeepSeek-R1-Distill-Qwen-7B-GGUF:Q4_K_M", ("llama-cpp-deepseek-r1", None)),
+    (1024, True, "To find the sum of.*",                                  "First, I need to add the tens place.*",       "bartowski/DeepSeek-R1-Distill-Qwen-7B-GGUF:Q4_K_M", ("llama-cpp-deepseek-r1", None)),
 ])
 def test_thoughts(n_predict: int, think: bool, expect_content: str | None, expect_reasoning_content: str | None, hf_repo: str, template_override: str | Tuple[str, str | None] | None):
     global server