diff --git a/amaranth/sim/_async.py b/amaranth/sim/_async.py
index 2f41dd3d5..a140e3222 100644
--- a/amaranth/sim/_async.py
+++ b/amaranth/sim/_async.py
@@ -352,12 +352,15 @@ async def until(self, condition: ValueLike):
                 raise TypeError(f"The shape of a condition may only be `signed` or `unsigned`, "
                                 f"not {shape!r}")
         tick = self.sample(condition).__aiter__()
-        done = False
-        while not done:
-            clk, rst, *values, done = await tick.__anext__()
-            if rst:
-                raise DomainReset
-        return tuple(values)
+        try:
+            done = False
+            while not done:
+                clk, rst, *values, done = await tick.__anext__()
+                if rst:
+                    raise DomainReset
+            return tuple(values)
+        finally:
+            await tick.aclose()
 
     async def repeat(self, count: int):
         """Repeat this trigger a specific number of times.
@@ -390,12 +393,15 @@ async def repeat(self, count: int):
         if count <= 0:
             raise ValueError(f"Repeat count must be a positive integer, not {count!r}")
         tick = self.__aiter__()
-        for _ in range(count):
-            clk, rst, *values = await tick.__anext__()
-            if rst:
-                raise DomainReset
-            assert clk
-        return tuple(values)
+        try:
+            for _ in range(count):
+                clk, rst, *values = await tick.__anext__()
+                if rst:
+                    raise DomainReset
+                assert clk
+            return tuple(values)
+        finally:
+            await tick.aclose()
 
     def _collect_trigger(self):
         clk_polarity = (1 if self._domain.clk_edge == "pos" else 0)