diff --git a/src/output/output_hds.cpp b/src/output/output_hds.cpp
index 37f39cd1..04fbdfab 100644
--- a/src/output/output_hds.cpp
+++ b/src/output/output_hds.cpp
@@ -233,14 +233,16 @@ namespace Mist {
         HTTP_S.Chunkify("\000\000\000\000mdat", 8, myConn);
         //send init data, if needed.
         if (audioTrack > 0 && myMeta.tracks[audioTrack].init != ""){
-          tag.DTSCAudioInit(myMeta.tracks[audioTrack]);
-          tag.tagTime(mstime);
-          HTTP_S.Chunkify(tag.data, tag.len, myConn);
+          if (tag.DTSCAudioInit(myMeta.tracks[audioTrack])){
+            tag.tagTime(mstime);
+            HTTP_S.Chunkify(tag.data, tag.len, myConn);
+          }
         }
         if (tid > 0){
-          tag.DTSCVideoInit(myMeta.tracks[tid]);
-          tag.tagTime(mstime);
-          HTTP_S.Chunkify(tag.data, tag.len, myConn);
+          if (tag.DTSCVideoInit(myMeta.tracks[tid])){
+            tag.tagTime(mstime);
+            HTTP_S.Chunkify(tag.data, tag.len, myConn);
+          }
         }
         parseData = true;
         wantRequest = false;
diff --git a/src/output/output_progressive_flv.cpp b/src/output/output_progressive_flv.cpp
index 3814c04c..fd5b839b 100644
--- a/src/output/output_progressive_flv.cpp
+++ b/src/output/output_progressive_flv.cpp
@@ -52,12 +52,14 @@ namespace Mist {
 
     for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
       if (myMeta.tracks[*it].type == "video"){
-        tag.DTSCVideoInit(myMeta.tracks[*it]);
-        myConn.SendNow(tag.data, tag.len);
+        if (tag.DTSCVideoInit(myMeta.tracks[*it])){
+          myConn.SendNow(tag.data, tag.len);
+        }
       }
       if (myMeta.tracks[*it].type == "audio"){
-        tag.DTSCAudioInit(myMeta.tracks[*it]);
-        myConn.SendNow(tag.data, tag.len);
+        if (tag.DTSCAudioInit(myMeta.tracks[*it])){
+          myConn.SendNow(tag.data, tag.len);
+        }
       }
     }
     sentHeader = true;
diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp
index ae419987..6bbc94f0 100644
--- a/src/output/output_rtmp.cpp
+++ b/src/output/output_rtmp.cpp
@@ -281,14 +281,12 @@ namespace Mist {
 
     for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++) {
       if (myMeta.tracks[*it].type == "video") {
-        tag.DTSCVideoInit(myMeta.tracks[*it]);
-        if (tag.len) {
+        if (tag.DTSCVideoInit(myMeta.tracks[*it])){
           myConn.SendNow(RTMPStream::SendMedia(tag));
         }
       }
       if (myMeta.tracks[*it].type == "audio") {
-        tag.DTSCAudioInit(myMeta.tracks[*it]);
-        if (tag.len) {
+        if (tag.DTSCAudioInit(myMeta.tracks[*it])){
           myConn.SendNow(RTMPStream::SendMedia(tag));
         }
       }