diff --git a/plugins/rtp/CMakeLists.txt b/plugins/rtp/CMakeLists.txt
index 3a121a13..4c159c1b 100644
--- a/plugins/rtp/CMakeLists.txt
+++ b/plugins/rtp/CMakeLists.txt
@@ -16,6 +16,10 @@ if(GstRtp_VERSION VERSION_GREATER "1.16")
     set(RTP_DEFINITIONS GST_1_16)
 endif()
 
+if(GstRtp_VERSION VERSION_GREATER "1.18")
+    set(RTP_DEFINITIONS GST_1_18)
+endif()
+
 if(Vala_VERSION VERSION_GREATER "0.50")
     set(RTP_DEFINITIONS VALA_0_50)
 endif()
diff --git a/plugins/rtp/src/codec_util.vala b/plugins/rtp/src/codec_util.vala
index 6fb5e7aa..9709025e 100644
--- a/plugins/rtp/src/codec_util.vala
+++ b/plugins/rtp/src/codec_util.vala
@@ -132,8 +132,8 @@ public class Dino.Plugins.Rtp.CodecUtil {
     }
 
     public static string? get_encode_prefix(string media, string codec, string encode, JingleRtp.PayloadType? payload_type) {
-        if (encode == "msdkh264enc") return "video/x-raw,format=NV12 ! ";
-        if (encode == "vaapih264enc") return "video/x-raw,format=NV12 ! ";
+        if (encode == "msdkh264enc") return "capsfilter caps=video/x-raw,format=NV12 ! ";
+        if (encode == "vaapih264enc") return "capsfilter caps=video/x-raw,format=NV12 ! ";
         return null;
     }
 
@@ -228,7 +228,7 @@ public class Dino.Plugins.Rtp.CodecUtil {
     }
 
     public static string? get_depay_args(string media, string codec, string encode, JingleRtp.PayloadType? payload_type) {
-#if GST_1_16
+#if GST_1_18
         if (codec == "vp8") return " wait-for-keyframe=true";
 #endif
         return null;