diff --git a/src/networking.cpp b/src/networking.cpp
index 1638328c0..72b2ec59e 100644
--- a/src/networking.cpp
+++ b/src/networking.cpp
@@ -2694,7 +2694,7 @@ void readQueryFromClient(connection *conn) {
         return;
     }
 
-    if (cserver.cthreads > 1) {
+    if (cserver.cthreads > 1 || g_pserver->m_pstorageFactory) {
         parseClientCommandBuffer(c);
         serverTL->vecclientsProcess.push_back(c);
     } else {