diff --git a/Source/audio/ShapeVoice.cpp b/Source/audio/ShapeVoice.cpp
index ef84880d..6a895719 100644
--- a/Source/audio/ShapeVoice.cpp
+++ b/Source/audio/ShapeVoice.cpp
@@ -148,6 +148,9 @@ void ShapeVoice::renderNextBlock(juce::AudioSampleBuffer& outputBuffer, int star
         if (!renderingSample && frameDrawn >= drawnFrameLength) {
             if (sound.load() != nullptr && currentlyPlaying) {
                 frameLength = sound.load()->updateFrame(frame);
+                frameDrawn = 0.0;
+                shapeDrawn = 0.0;
+                currentShape = 0;
             }
             // TODO: updateFrame already iterates over all the shapes,
             // so we can improve performance by calculating frameDrawn