diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index d2035e81..1daf8534 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -1905,8 +1905,17 @@ SafeWriter* DivEngine::saveDMF() {
 }
 
 SafeWriter* DivEngine::saveVGM() {
+  stop();
+  setOrder(0);
   isBusy.lock();
   // play the song ourselves
+  playSub(false);
+  bool done=false;
+
+  while (!done) {
+    if (nextTick()) done=true;
+  }
+
   isBusy.unlock();
   return NULL;
 }