diff --git a/src/output/output.cpp b/src/output/output.cpp
index c16cbd3a..20c5e90d 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -1038,6 +1038,7 @@ namespace Mist {
         break;
       }
     }
+    selectedTracks.erase(trackId);
   }
  
   ///Attempts to prepare a new packet for output.
diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp
index 5eff3cb1..54490e3d 100644
--- a/src/output/output_rtmp.cpp
+++ b/src/output/output_rtmp.cpp
@@ -277,6 +277,21 @@ namespace Mist {
   }
   
   void OutRTMP::sendNext() {
+
+    //If there are now more selectable tracks, select the new track and do a seek to the current timestamp
+    //Set sentHeader to false to force it to send init data
+    if (selectedTracks.size() < 2 && myMeta.tracks.size() > 1){
+      size_t prevTrackCount = selectedTracks.size();
+      selectDefaultTracks();
+      if (selectedTracks.size() > prevTrackCount){
+        INFO_MSG("Picked up new track - selecting it and resetting state.");
+        sentHeader = false;
+        seek(thisPacket.getTime());
+      }
+      return;
+    }
+
+
     char rtmpheader[] = {0, //byte 0 = cs_id | ch_type
                          0, 0, 0, //bytes 1-3 = timestamp
                          0, 0, 0, //bytes 4-6 = length