diff --git a/daemon/codec.c b/daemon/codec.c
index a2bf68705..8df2f2437 100644
--- a/daemon/codec.c
+++ b/daemon/codec.c
@@ -335,6 +335,7 @@ static int packet_decoded_audio_player(decoder_t *decoder, AVFrame *frame, void
 
 static void codec_touched(struct codec_store *cs, rtp_payload_type *pt);
 
+__attribute__((nonnull(4, 5, 6)))
 static bool __buffer_dtx(struct dtx_buffer *dtxb, struct codec_ssrc_handler *ch,
 		struct codec_ssrc_handler *input_handler,
 		struct transcode_packet *packet, struct media_packet *mp,
@@ -3417,7 +3418,7 @@ static bool __buffer_dtx(struct dtx_buffer *dtxb, struct codec_ssrc_handler *dec
 		return true;
 	}
 
-	unsigned long ts = packet ? packet->ts : 0;
+	unsigned long ts = packet->ts;
 
 	if (!mp->ssrc_out->seq_set) {
 		mp->ssrc_out->seq_set = true;
@@ -3453,7 +3454,7 @@ static bool __buffer_dtx(struct dtx_buffer *dtxb, struct codec_ssrc_handler *dec
 	}
 
 	// packet now consumed if there was one
-	bool ret = packet ? true : false;
+	bool ret = true;
 	packet = NULL;
 
 	mutex_unlock(&dtxb->lock);