diff --git a/daemon/sdp.c b/daemon/sdp.c
index 50d2d66e9..5f5b50b4b 100644
--- a/daemon/sdp.c
+++ b/daemon/sdp.c
@@ -1639,7 +1639,7 @@ static void __sdp_ice(struct stream_params *sp, struct sdp_media *media) {
 	}
 
 no_cand:
-	if ((attr = attr_get_by_id(&media->attributes, ATTR_ICE_OPTIONS))) {
+	if ((attr = attr_get_by_id_m_s(media, ATTR_ICE_OPTIONS))) {
 		if (str_str(&attr->value, "trickle") >= 0)
 			SP_SET(sp, TRICKLE_ICE);
 	}
@@ -1822,17 +1822,17 @@ int sdp_streams(const GQueue *sessions, GQueue *streams, struct sdp_ng_flags *fl
 			sp->index = ++num;
 			codec_store_init(&sp->codecs, NULL);
 
+			errstr = "No address info found for stream";
+			if (!flags->fragment
+					&& fill_endpoint(&sp->rtp_endpoint, media, flags, NULL, media->port_num))
+				goto error;
+
 			__sdp_ice(sp, media);
 			if (SP_ISSET(sp, ICE)) {
 				// ignore "received from" (SIP-source-address) when ICE is in use
 				flags->trust_address = 1;
 			}
 
-			errstr = "No address info found for stream";
-			if (!flags->fragment
-					&& fill_endpoint(&sp->rtp_endpoint, media, flags, NULL, media->port_num))
-				goto error;
-
 			sp->consecutive_ports = media->port_count;
 			sp->num_ports = sp->consecutive_ports * 2; // only do *=2 for RTP streams?
 			sp->protocol_str = media->transport;
diff --git a/t/auto-daemon-tests-websocket.py b/t/auto-daemon-tests-websocket.py
index 7ffecea71..45c9fa546 100644
--- a/t/auto-daemon-tests-websocket.py
+++ b/t/auto-daemon-tests-websocket.py
@@ -1422,12 +1422,12 @@ class TestVideoroom(unittest.TestCase):
                             "a=group:BUNDLE 0 1\r\n"
                             "a=extmap-allow-mixed\r\n"
                             "a=msid-semantic: WMS hJifdaJwqEqHxSG0pVbs1DrLAwiHqz7fKlqC\r\n"
+                            "a=ice-options:trickle\r\n"
                             "m=audio 9 UDP/TLS/RTP/SAVPF 111 103 104 9 0 8 106 105 13 110 112 113 126\r\n"
                             "c=IN IP4 0.0.0.0\r\n"
                             "a=rtcp:9 IN IP4 0.0.0.0\r\n"
                             "a=ice-ufrag:+JrN\r\n"
                             "a=ice-pwd:TMWORlSHr9fd+0bUNXnlBs5D\r\n"
-                            "a=ice-options:trickle\r\n"
                             "a=fingerprint:sha-256 FD:56:1A:DB:3E:7B:8E:0B:75:4E:2E:49:1A:91:52:E4:69:9E:66:91:FF:34:A2:50:58:72:C0:8E:C2:87:CA:1F\r\n"
                             "a=setup:actpass\r\n"
                             "a=mid:0\r\n"
@@ -1464,7 +1464,6 @@ class TestVideoroom(unittest.TestCase):
                             "a=rtcp:9 IN IP4 0.0.0.0\r\n"
                             "a=ice-ufrag:+JrN\r\n"
                             "a=ice-pwd:TMWORlSHr9fd+0bUNXnlBs5D\r\n"
-                            "a=ice-options:trickle\r\n"
                             "a=fingerprint:sha-256 FD:56:1A:DB:3E:7B:8E:0B:75:4E:2E:49:1A:91:52:E4:69:9E:66:91:FF:34:A2:50:58:72:C0:8E:C2:87:CA:1F\r\n"
                             "a=setup:actpass\r\n"
                             "a=mid:1\r\n"