diff --git a/src/field/arena.ts b/src/field/arena.ts
index c631e94bd18..ffecd77b42f 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -434,9 +434,9 @@ export class Arena {
   }
 
   removeAllTags(): void {
-    for (let t of this.tags) {
-      t.onRemove(this);
-      this.tags.splice(this.tags.indexOf(t), 1);
+    while (this.tags.length) {
+      this.tags[0].onRemove(this);
+      this.tags.splice(0, 1);
     }
   }