diff --git a/src/zm_db.cpp b/src/zm_db.cpp
index e3b737c07..f0b13d538 100644
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@@ -251,11 +251,11 @@ void zmDbQueue::process() {
       mCondition.wait(lock);
     }
     while (!mQueue.empty()) {
-      if (mQueue.size() > 10) {
+      if (mQueue.size() > 20) {
         Logger *log = Logger::fetch();
         Logger::Level db_level = log->databaseLevel();
         log->databaseLevel(Logger::NOLOG);
-        Warning("db queue size has grown larger %zu than 10 entries", mQueue.size());
+        Warning("db queue size has grown larger %zu than 20 entries", mQueue.size());
         log->databaseLevel(db_level);
       }
       std::string sql = mQueue.front();
@@ -271,8 +271,10 @@ void zmDbQueue::process() {
 
 void zmDbQueue::push(std::string &&sql) {
   if (mTerminate) return;
-  std::unique_lock<std::mutex> lock(mMutex);
-  mQueue.push(std::move(sql));
+  {
+    std::unique_lock<std::mutex> lock(mMutex);
+    mQueue.push(std::move(sql));
+  }
   mCondition.notify_all();
 }