diff --git a/ecs/wait.go b/ecs/wait.go
index 55c47da96..954b43e45 100644
--- a/ecs/wait.go
+++ b/ecs/wait.go
@@ -112,10 +112,11 @@ func (b *ecsAPIService) WaitStackCompletion(ctx context.Context, name string, op
 			continue
 		}
 		if err := b.SDK.CheckStackState(ctx, name); err != nil {
+			if e := b.SDK.DeleteStack(ctx, name); e != nil {
+				return e
+			}
 			stackErr = err
-			b.SDK.DeleteStack(ctx, name)
 			operation = stackDelete
-
 			reason := err.Error()
 			if len(reason) > 30 {
 				reason = reason[:30] + "..."