diff --git a/repl/src/draw.mjs b/repl/src/draw.mjs
index 5ed7eb88..6725a512 100644
--- a/repl/src/draw.mjs
+++ b/repl/src/draw.mjs
@@ -29,7 +29,9 @@ Pattern.prototype.draw = function (callback, cycleSpan, lookaheadCycles = 1) {
         cycle = currentCycle;
         const begin = currentCycle * cycleSpan;
         const end = (currentCycle + lookaheadCycles) * cycleSpan;
-        events = this.add(0).query(new State(new TimeSpan(begin, end)));
+        events = this.add(0)
+          .query(new State(new TimeSpan(begin, end)))
+          .filter((event) => event.part.begin.valueOf() === event.whole.begin.valueOf());
       }
     }
     callback(ctx, events, t, cycleSpan, time);
diff --git a/repl/src/useCycle.ts b/repl/src/useCycle.ts
index 4bc1ba3a..2521eb96 100644
--- a/repl/src/useCycle.ts
+++ b/repl/src/useCycle.ts
@@ -44,7 +44,7 @@ function useCycle(props: UseCycleProps) {
       .forEach((event) => {
         Tone.getTransport().schedule((time) => {
           const toneEvent = {
-            time: event.part.begin.valueOf(),
+            time: event.whole.begin.valueOf(),
             duration: event.whole.end.sub(event.whole.begin).valueOf(),
             value: event.value,
             context: event.context,