diff --git a/Connector_HTTP/main.cpp b/Connector_HTTP/main.cpp
index 465fa069..b7fff570 100644
--- a/Connector_HTTP/main.cpp
+++ b/Connector_HTTP/main.cpp
@@ -271,7 +271,7 @@ namespace Connector_HTTP{
                     }
                   }
                   if (tag.isKeyframe){
-                    if (FlashBuf != ""){
+                    if (FlashBuf != "" && !FlashFirstVideo && !FlashFirstAudio){
                       Flash_FragBuffer.push(FlashBuf);
                       #if DEBUG >= 4
                       fprintf(stderr, "Received a fragment. Now %i in buffer.\n", (int)Flash_FragBuffer.size());
@@ -294,7 +294,9 @@ namespace Connector_HTTP{
                   #if DEBUG >= 5
                   fprintf(stderr, "Received a tag of type %2hhu and length %i\n", tag.data[0], tag.len);
                   #endif
-                  FlashBuf.append(tag.data,tag.len);
+                  if ((Video_Init.len > 0) && (Audio_Init.len > 0)){
+                    FlashBuf.append(tag.data,tag.len);
+                  }
                 } else {
                   FlashMeta = "";
                   FlashMeta.append(tag.data+11,tag.len-15);