diff --git a/daemon/call.c b/daemon/call.c
index 8617a924e..bda46473c 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -2480,11 +2480,8 @@ void codecs_offer_answer(struct call_media *media, struct call_media *other_medi
 		// don't do codec answer for a rejected media section
 		if (other_media->streams.length == 0)
 			codec_answer_only = false;
-		else {
-			struct packet_stream *ps = other_media->streams.head->data;
-			if (ps->endpoint.port == 0)
-				codec_answer_only = false;
-		}
+		else if (sp->rtp_endpoint.port == 0)
+			codec_answer_only = false;
 
 		if (flags->reuse_codec)
 			codec_store_populate_reuse(&other_media->codecs, &sp->codecs, flags->codec_set,
diff --git a/t/auto-daemon-tests.pl b/t/auto-daemon-tests.pl
index 6cc2ee6d9..a0a928ebb 100755
--- a/t/auto-daemon-tests.pl
+++ b/t/auto-daemon-tests.pl
@@ -78,6 +78,152 @@ sub stun_succ {
 };
 
 
+new_call;
+
+offer('GH 1499',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 172.17.0.2
+s=tester
+t=0 0
+c=IN IP4 172.17.0.2
+m=audio 4024 RTP/AVP 0 9 8
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 172.17.0.2
+s=tester
+t=0 0
+c=IN IP4 203.0.113.1
+m=audio PORT RTP/AVP 0 9 8
+a=rtpmap:0 PCMU/8000
+a=rtpmap:9 G722/8000
+a=rtpmap:8 PCMA/8000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+answer('GH 1499',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 172.17.0.2
+s=tester
+t=0 0
+c=IN IP4 172.17.0.2
+m=audio 4026 RTP/AVP 8 101
+a=rtpmap:101 telephone-event/8000
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 172.17.0.2
+s=tester
+t=0 0
+c=IN IP4 203.0.113.1
+m=audio PORT RTP/AVP 8
+a=rtpmap:8 PCMA/8000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+
+new_call;
+
+offer('GH 1499 corollary',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 172.17.0.2
+s=tester
+t=0 0
+c=IN IP4 172.17.0.2
+m=audio 4024 RTP/AVP 0 8
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 172.17.0.2
+s=tester
+t=0 0
+c=IN IP4 203.0.113.1
+m=audio PORT RTP/AVP 0 8
+a=rtpmap:0 PCMU/8000
+a=rtpmap:8 PCMA/8000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+answer('GH 1499 corollary',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 172.17.0.2
+s=tester
+t=0 0
+c=IN IP4 172.17.0.2
+m=audio 4026 RTP/AVP 8 9
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 172.17.0.2
+s=tester
+t=0 0
+c=IN IP4 203.0.113.1
+m=audio PORT RTP/AVP 8
+a=rtpmap:8 PCMA/8000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+
+new_call;
+
+offer('GH 1499 control',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 172.17.0.2
+s=tester
+t=0 0
+c=IN IP4 172.17.0.2
+m=audio 4024 RTP/AVP 0 8
+m=audio 4026 RTP/AVP 8 9
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 172.17.0.2
+s=tester
+t=0 0
+c=IN IP4 203.0.113.1
+m=audio PORT RTP/AVP 0 8
+a=rtpmap:0 PCMU/8000
+a=rtpmap:8 PCMA/8000
+a=sendrecv
+a=rtcp:PORT
+m=audio PORT RTP/AVP 8 9
+a=rtpmap:8 PCMA/8000
+a=rtpmap:9 G722/8000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+answer('GH 1499 control',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 172.17.0.2
+s=tester
+t=0 0
+c=IN IP4 172.17.0.2
+m=audio 4026 RTP/AVP 8 9
+m=audio 0 RTP/AVP 0
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 172.17.0.2
+s=tester
+t=0 0
+c=IN IP4 203.0.113.1
+m=audio PORT RTP/AVP 8
+a=rtpmap:8 PCMA/8000
+a=sendrecv
+a=rtcp:PORT
+m=audio 0 RTP/AVP 8
+SDP
+# ^ technically fishy - rejected stream should not do offer/answer and should just
+# pass through 0 instead
+
+
+
+
 ($sock_a, $sock_b, $sock_c, $sock_d) = new_call([qw(198.51.100.4 2412)], [qw(198.51.100.4 2413)], [qw(198.51.100.8 3412)], [qw(198.51.100.8 3413)]);
 
 offer('ICE with just peer reflexive',
@@ -15471,4 +15617,5 @@ SDP
 
 
 
+#done_testing;NGCP::Rtpengine::AutoTest::terminate('f00');exit;
 done_testing();
diff --git a/t/test-transcode.c b/t/test-transcode.c
index d43203565..6bc23dfa8 100644
--- a/t/test-transcode.c
+++ b/t/test-transcode.c
@@ -69,6 +69,7 @@ static void __cleanup(void) {
 static void __init(void) {
 	__cleanup();
 	codec_store_init(&rtp_types_sp.codecs, NULL);
+	rtp_types_sp.rtp_endpoint.port = 9;
 	flags.codec_except = g_hash_table_new_full(str_case_hash, str_case_equal, free, NULL);
 	flags.codec_set = g_hash_table_new_full(str_case_hash, str_case_equal, free, free);
 	ml_A.ssrc_hash = create_ssrc_hash_call();