diff --git a/workbooks/stack.yaml b/workbooks/stack.yaml
index 994d81f51..8a845e54f 100644
--- a/workbooks/stack.yaml
+++ b/workbooks/stack.yaml
@@ -96,7 +96,7 @@ workflows:
         retry:
           delay: 15
           count: <% $.timeout / 15 %>
-          continue-on: <% $.stack_status = 'DELETE_FAILED' or $.stack in task().result.stacks.select([$.stack_name, $.id]).flatten() %>
+          continue-on: <% $.stack in task().result.stacks.select([$.stack_name, $.id]).flatten() and $.stack_status = 'DELETE_IN_PROGRESS' %>
         on-complete:
           fail: <% $.stack_status = 'DELETE_FAILED' %>