diff --git a/master/buildbot/worker/latent.py b/master/buildbot/worker/latent.py
index <HASH>..<HASH> 100644
--- a/master/buildbot/worker/latent.py
+++ b/master/buildbot/worker/latent.py
@@ -341,7 +341,8 @@ class AbstractLatentWorker(AbstractWorker):
         if self.state == States.NOT_SUBSTANTIATED:
             return
 
-        if self.state == States.INSUBSTANTIATING:
+        if self.state in [States.INSUBSTANTIATING,
+                          States.INSUBSTANTIATING_SUBSTANTIATING]:
             yield self._insubstantiation_notifier.wait()
             return
latent: Handle INSUBSTANTIATING_SUBSTANTIATING during insubstantiate()