diff --git a/tracker/agb-tracker/src/lib.rs b/tracker/agb-tracker/src/lib.rs
index 533f6940..f0593618 100644
--- a/tracker/agb-tracker/src/lib.rs
+++ b/tracker/agb-tracker/src/lib.rs
@@ -237,7 +237,7 @@ impl Tracker {
                     }
 
                     if envelope_state.frame >= envelope.amount.len() {
-                        envelope_state_option.take();
+                        envelope_state.frame = envelope.amount.len() - 1;
                     }
                 }
             }