diff --git a/src/buffer/buffer_stream.cpp b/src/buffer/buffer_stream.cpp
index 2e6b6ed7..944357ec 100644
--- a/src/buffer/buffer_stream.cpp
+++ b/src/buffer/buffer_stream.cpp
@@ -17,6 +17,8 @@ namespace Buffer {
       creator.lock();
       if (ref == 0){
         ref = new Stream();
+        ref->metadata["tracks"] = 1ll;
+        ref->metadata["live"] = 1ll;
       }
       creator.unlock();
     }
diff --git a/src/connectors/conn_rtmp.cpp b/src/connectors/conn_rtmp.cpp
index cbfd8fb1..798bb4b5 100644
--- a/src/connectors/conn_rtmp.cpp
+++ b/src/connectors/conn_rtmp.cpp
@@ -195,6 +195,8 @@ namespace Connector_RTMP {
           Socket.close(); //disconnect user
           return;
         }
+        DTSC::Stream Strm;
+        Strm.waitForMeta(ss);
         ss.Send("P ");
         ss.Send(Socket.getHost().c_str());
         ss.Send(" ");