diff --git a/packages/codemirror/codemirror.mjs b/packages/codemirror/codemirror.mjs
index bbcf0792..02ee37d9 100644
--- a/packages/codemirror/codemirror.mjs
+++ b/packages/codemirror/codemirror.mjs
@@ -188,7 +188,7 @@ export class StrudelMirror {
     await this.prebaked;
     try {
       await this.repl.evaluate(this.code, false);
-      this.drawer.invalidate(this.repl.scheduler);
+      this.drawer.invalidate(this.repl.scheduler, -0.001);
       // draw at -0.001 to avoid haps at 0 to be visualized as active
       this.onDraw?.(this.drawer.visibleHaps, -0.001, [], this.painters);
     } catch (err) {
diff --git a/packages/core/draw.mjs b/packages/core/draw.mjs
index c57baa63..ff5359e1 100644
--- a/packages/core/draw.mjs
+++ b/packages/core/draw.mjs
@@ -145,12 +145,13 @@ export class Drawer {
       },
     );
   }
-  invalidate(scheduler = this.scheduler) {
+  invalidate(scheduler = this.scheduler, t) {
     if (!scheduler) {
       return;
     }
+    // TODO: scheduler.now() seems to move even when it's stopped, this hints at a bug...
+    t = t ?? scheduler.now();
     this.scheduler = scheduler;
-    const t = scheduler.now();
     let [_, lookahead] = this.drawTime;
     const [begin, end] = [Math.max(t, 0), t + lookahead + 0.1];
     // remove all future haps