diff --git a/src/tm-threads.c b/src/tm-threads.c
index 3286da52d9..6a403752e6 100644
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -1771,7 +1771,7 @@ TmEcode TmThreadSpawn(ThreadVars *tv)
         return TM_ECODE_FAILED;
     }
 
-    TmThreadWaitForFlag(tv, THV_INIT_DONE);
+    TmThreadWaitForFlag(tv, THV_INIT_DONE | THV_RUNNING_DONE);
 
     TmThreadAppend(tv, tv->type);