diff --git a/tools/server/server-context.cpp b/tools/server/server-context.cpp
index 4e0cd729eb..5d492479db 100644
--- a/tools/server/server-context.cpp
+++ b/tools/server/server-context.cpp
@@ -1181,7 +1181,7 @@ private:
 
         // initialize draft batch
         // TODO: rework speculative decoding [TAG_SERVER_SPEC_REWORK]
-        if (slot.ctx_dft || task.params.speculative.use_self) {
+        if (can_speculate()) {
             llama_batch_free(slot.batch_spec);
 
             slot.batch_spec = llama_batch_init(task.params.speculative.n_max + 1, 0, 1);