diff --git a/src/gst-plugins/recorderendpoint/kmsavmuxer.c b/src/gst-plugins/recorderendpoint/kmsavmuxer.c
index 26ee370ea..4fc6db21c 100644
--- a/src/gst-plugins/recorderendpoint/kmsavmuxer.c
+++ b/src/gst-plugins/recorderendpoint/kmsavmuxer.c
@@ -206,9 +206,13 @@ kms_av_muxer_prepare_pipeline (KmsAVMuxer * self)
       (self), KMS_BASE_MEDIA_MUXER_GET_URI (self));
 
   g_object_set (self->priv->videosrc, "block", TRUE, "format", GST_FORMAT_TIME,
-      "max-bytes", 0, NULL);
+      "is-live", TRUE, "do-timestamp", TRUE, "min-latency",
+      G_GUINT64_CONSTANT (0), "max-latency", G_GUINT64_CONSTANT (0),
+      "emit-signals", FALSE, "max-bytes", 1000000, NULL);
   g_object_set (self->priv->audiosrc, "block", TRUE, "format", GST_FORMAT_TIME,
-      "max-bytes", 0, NULL);
+      "is-live", TRUE, "do-timestamp", TRUE, "min-latency",
+      G_GUINT64_CONSTANT (0), "max-latency", G_GUINT64_CONSTANT (0),
+      "emit-signals", FALSE, "max-bytes", 100000, NULL);
 
   self->priv->mux = kms_av_muxer_create_muxer (self);
 
diff --git a/src/gst-plugins/recorderendpoint/kmsrecorderendpoint.c b/src/gst-plugins/recorderendpoint/kmsrecorderendpoint.c
index f5c0b42bf..15f1b21f2 100644
--- a/src/gst-plugins/recorderendpoint/kmsrecorderendpoint.c
+++ b/src/gst-plugins/recorderendpoint/kmsrecorderendpoint.c
@@ -18,7 +18,7 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE // Enable GNU Extensions: 'ALLPERMS' is not POSIX
+#define _GNU_SOURCE             // Enable GNU Extensions: 'ALLPERMS' is not POSIX
 #include <sys/stat.h>
 
 #include <string.h>
@@ -1179,7 +1179,7 @@ kms_recorder_endpoint_add_appsink (KmsRecorderEndpoint * self,
   appsink = gst_element_factory_make ("appsink", NULL);
 
   g_object_set (appsink, "emit-signals", FALSE, "async", FALSE,
-      "sync", FALSE, "qos", FALSE, NULL);
+      "sync", FALSE, "qos", FALSE, "max-buffers", 2, NULL);
 
   gst_bin_add (GST_BIN (self), appsink);