diff --git a/daemon/call.c b/daemon/call.c
index e3e84acad..1b43d2568 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -3139,6 +3139,9 @@ static void media_make_audio_player(struct call_media *media, rtp_payload_type *
 	if (!MEDIA_ARESET2(media, AUDIO_PLAYER, SEND))
 		return;
 
+	if (media->type_id != MT_AUDIO)
+		return;
+
 	audio_player_setup(media, pref_dest_codec, rtpe_config.audio_buffer_length,
 			rtpe_config.audio_buffer_delay,
 			flags->codec_set);
diff --git a/daemon/codec.c b/daemon/codec.c
index 04ca44e39..4c46bfa4a 100644
--- a/daemon/codec.c
+++ b/daemon/codec.c
@@ -1869,7 +1869,7 @@ next:
 		if (a.reset_transcoding && ms)
 			ms->attrs.transcoding = true;
 
-		if (!use_audio_player || !pref_dest_codec) {
+		if (!use_audio_player || !pref_dest_codec || sink->type_id != MT_AUDIO) {
 			// we have to translate RTCP packets
 			source->rtcp_handler = rtcp_transcode_handler;