diff --git a/src/buffer/buffer_stream.cpp b/src/buffer/buffer_stream.cpp
index 30aa4f77..4f3fd448 100644
--- a/src/buffer/buffer_stream.cpp
+++ b/src/buffer/buffer_stream.cpp
@@ -72,8 +72,9 @@ namespace Buffer {
         it->second.removeMember("keys");
         it->second.removeMember("frags");
       }
+      //delete empty trackname if present - these are never interesting
+      Storage["meta"]["tracks"].removeMember("");
     }
-
     ret = Storage.toString();
     Storage["log"].null();
     return ret;
diff --git a/src/connectors/conn_rtmp.cpp b/src/connectors/conn_rtmp.cpp
index 4ed57d8b..2ca9bd84 100644
--- a/src/connectors/conn_rtmp.cpp
+++ b/src/connectors/conn_rtmp.cpp
@@ -29,6 +29,7 @@ namespace Connector_RTMP {
   bool inited = false; ///< Indicates whether we are ready to connect to the Buffer.
   bool noStats = false; ///< Indicates when no stats should be sent anymore. Used in push mode.
   bool stopParsing = false; ///< Indicates when to stop all parsing.
+  bool streamReset = false;
 
   //for reply to play command
   int playTransaction = -1;///<The transaction number of the reply.
@@ -194,6 +195,7 @@ namespace Connector_RTMP {
         ss.Send("P ");
         ss.Send(Socket.getHost().c_str());
         ss.Send("\n");
+        streamReset = true;
         noStats = true;
       }
       //send a _result reply
@@ -413,6 +415,14 @@ namespace Connector_RTMP {
         case 9: //video data
         case 18: //meta data
           if (ss.connected()){
+            if (streamReset){
+              //reset push data to empty, in case stream properties change
+              meta_out.null();
+              prebuffer.str("");
+              sending = false;
+              counter = 0;
+              streamReset = false;
+            }
             F.ChunkLoader(next);
             JSON::Value pack_out = F.toJSON(meta_out);
             if ( !pack_out.isNull()){