diff --git a/common/speculative.cpp b/common/speculative.cpp
index e559675c436ef..3fcbb0020b6af 100644
--- a/common/speculative.cpp
+++ b/common/speculative.cpp
@@ -62,6 +62,10 @@ struct common_speculative * common_speculative_init(
 }
 
 void common_speculative_free(struct common_speculative * spec) {
+    if (spec == nullptr) {
+        return;
+    }
+
     common_sampler_free(spec->smpl);
 
     llama_batch_free(spec->batch);
diff --git a/examples/server/server.cpp b/examples/server/server.cpp
index 809fafa187add..d57a296a2de07 100644
--- a/examples/server/server.cpp
+++ b/examples/server/server.cpp
@@ -720,7 +720,7 @@ struct server_slot {
     int id;
     int id_task = -1;
 
-    llama_batch batch_spec;
+    llama_batch batch_spec = {};
 
     llama_context * ctx_dft = nullptr;