diff --git a/workbooks/stack.yaml b/workbooks/stack.yaml
index ab9cab597..289852c46 100644
--- a/workbooks/stack.yaml
+++ b/workbooks/stack.yaml
@@ -47,7 +47,7 @@ workflows:
         retry:
           delay: 15
           count: <% $.timeout / 15 %>
-          continue-on: <% $.stack in task(wait_for_stack_does_not_exist).result.select($.stack_name) %>
+          continue-on: <% $.stack in task(wait_for_stack_does_not_exist).result.select([$.stack_name, $.id]).flatten() %>
 
   delete_stack:
     input: