diff --git a/src/input/input_buffer.cpp b/src/input/input_buffer.cpp
index a3d9f4a1..1221aac2 100644
--- a/src/input/input_buffer.cpp
+++ b/src/input/input_buffer.cpp
@@ -222,6 +222,7 @@ namespace Mist {
                 INFO_MSG("Re-push initiated for track %lu, from user %u, will replace final track number %d", value, id, finalMap);
                 myMeta.tracks.erase(finalMap);
                 dataPages.erase(finalMap);
+                inputLoc.erase(finalMap);
               }
             }
             givenTracks.insert(finalMap);
diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp
index e0e01bee..ae419987 100644
--- a/src/output/output_rtmp.cpp
+++ b/src/output/output_rtmp.cpp
@@ -777,6 +777,7 @@ namespace Mist {
               counter++;
               if (counter > 8){
                 sending = true;
+                myMeta = meta_out;
                 negotiatePushTracks();
                 for (std::deque<JSON::Value>::iterator it = preBuf.begin(); it != preBuf.end(); it++){
                   bufferPacket((*it));