diff --git a/murano/engine/system/heat_stack.py b/murano/engine/system/heat_stack.py
index 23500041c..7736c48c2 100644
--- a/murano/engine/system/heat_stack.py
+++ b/murano/engine/system/heat_stack.py
@@ -213,8 +213,10 @@ class HeatStack(murano_object.MuranoObject):
         try:
             if not self.current(_context):
                 return
+            self._wait_state(_context, lambda s: True)
             client.stacks.delete(stack_id=self._name)
             self._wait_state(
+                _context,
                 lambda status: status in ('DELETE_COMPLETE', 'NOT_FOUND'),
                 wait_progress=True)
         except heat_exc.NotFound: