diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index d24700fe9..94f5d5b34 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -358,6 +358,14 @@ void DivEngine::runExportThread() {
         for (int j=0; j<chans; j++) {
           bool mute=(j!=i);
           isMuted[j]=mute;
+        }
+        if (getChannelType(i)==5) {
+          for (int j=i; j<chans; j++) {
+            if (getChannelType(j)!=5) break;
+            isMuted[j]=false;
+          }
+        }
+        for (int j=0; j<chans; j++) {
           if (disCont[dispatchOfChan[j]].dispatch!=NULL) {
             disCont[dispatchOfChan[j]].dispatch->muteChannel(dispatchChanOfChan[j],isMuted[j]);
           }
@@ -385,6 +393,15 @@ void DivEngine::runExportThread() {
         if (sf_close(sf)!=0) {
           logE("could not close audio file!");
         }
+
+        if (getChannelType(i)==5) {
+          i++;
+          while (true) {
+            if (++i>=chans) break;
+            if (getChannelType(i)!=5) break;
+          }
+          i--;
+        }
       }
       exporting=false;
 
@@ -414,7 +431,6 @@ void DivEngine::runExportThread() {
   }
 }
 
-// TODO: properly export ExtCh songs in per-channel mode
 bool DivEngine::saveAudio(const char* path, int loops, DivAudioExportModes mode) {
   exportPath=path;
   exportMode=mode;