diff --git a/controllers/llamaCPP.h b/controllers/llamaCPP.h
index 2d4b9884b..c07bc144c 100644
--- a/controllers/llamaCPP.h
+++ b/controllers/llamaCPP.h
@@ -1546,7 +1546,7 @@ struct llama_server_context {
       std::unique_lock<std::mutex> lock(mutex_tasks);
       condition_tasks.wait(lock, [&] {
         return (!queue_tasks.empty() && model_loaded_external) ||
-               (!model_loaded_external);
+               (queue_tasks.empty() && !model_loaded_external);
       });
     }
 
diff --git a/llama.cpp b/llama.cpp
index 18c2e1752..326b418b5 160000
--- a/llama.cpp
+++ b/llama.cpp
@@ -1 +1 @@
-Subproject commit 18c2e1752c3b387689e9e73d7d8a1a3b1511ce23
+Subproject commit 326b418b59b6d48d854c4461a2303e8ac0a311e6