diff --git a/src/modules/gst/gst-source.c b/src/modules/gst/gst-source.c
index a7a6da679..ed9155346 100644
--- a/src/modules/gst/gst-source.c
+++ b/src/modules/gst/gst-source.c
@@ -137,6 +137,8 @@ setup_pipeline (PinosGstSource *source, GError **error)
                             "sync-method", 0, /* latest */
                             "sync", TRUE,
                             "enable-last-sample", FALSE,
+                            "send-dispatched", TRUE,
+                            "send-messages", TRUE,
                             NULL);
 
   gst_bin_add (GST_BIN (priv->pipeline), priv->sink);
diff --git a/src/server/client-source.c b/src/server/client-source.c
index ff0938ef5..f2b78c30e 100644
--- a/src/server/client-source.c
+++ b/src/server/client-source.c
@@ -131,7 +131,8 @@ setup_pipeline (PinosClientSource *source)
 
   priv->pipeline = gst_parse_launch ("socketsrc "
                                          "name=src "
-                                         "caps=application/x-pinos ! "
+                                         "caps=application/x-pinos "
+                                         "send-messages=true ! "
                                      "pinospay ! "
                                      "multisocketsink "
                                          "buffers-max=2 "
@@ -140,7 +141,9 @@ setup_pipeline (PinosClientSource *source)
                                          "sync-method=latest "
                                          "name=sink "
                                          "sync=true "
-                                         "enable-last-sample=false",
+                                         "enable-last-sample=false "
+                                         "send-messages=true "
+                                         "send-dispatched=true",
                                       NULL);
   priv->sink = gst_bin_get_by_name (GST_BIN (priv->pipeline), "sink");
   priv->src = gst_bin_get_by_name (GST_BIN (priv->pipeline), "src");