diff --git a/src/output/output_http.cpp b/src/output/output_http.cpp
index 7dbe18a5..163f61b3 100644
--- a/src/output/output_http.cpp
+++ b/src/output/output_http.cpp
@@ -220,6 +220,25 @@ namespace Mist {
         selectedTracks.insert(JSON::Value(H.GetVar("video")).asInt());
       }
       selectDefaultTracks();
+      std::set<unsigned long> toRemove;
+      if (H.GetVar("video") == "0"){
+        for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
+          if (myMeta.tracks.at(*it).type=="video"){
+            toRemove.insert(*it);
+          }
+        }
+      }
+      if (H.GetVar("audio") == "0"){
+        for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
+          if (myMeta.tracks.at(*it).type=="audio"){
+            toRemove.insert(*it);
+          }
+        }
+      }
+      //remove those from selectedtracks
+      for (std::set<unsigned long>::iterator it = toRemove.begin(); it != toRemove.end(); it++){
+        selectedTracks.erase(*it);
+      }
       onHTTP();
       if (!H.bufferChunks){
         H.Clean();