diff --git a/api.go b/api.go
index baee204c..b85ac62c 100644
--- a/api.go
+++ b/api.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/api_js.go b/api_js.go
index 964b7b05..3d81ed7b 100644
--- a/api_js.go
+++ b/api_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc
diff --git a/api_test.go b/api_test.go
index b63756c3..d9f90be4 100644
--- a/api_test.go
+++ b/api_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/certificate.go b/certificate.go
index 7373a7d7..99e35974 100644
--- a/certificate.go
+++ b/certificate.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/certificate_test.go b/certificate_test.go
index 873bee33..bae16bfc 100644
--- a/certificate_test.go
+++ b/certificate_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/configuration.go b/configuration.go
index 712bab92..608c5ab7 100644
--- a/configuration.go
+++ b/configuration.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/configuration_js.go b/configuration_js.go
index 44ab9f3c..2ba4d268 100644
--- a/configuration_js.go
+++ b/configuration_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc
diff --git a/datachannel.go b/datachannel.go
index 3749fe77..4af5ac94 100644
--- a/datachannel.go
+++ b/datachannel.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/datachannel_go_test.go b/datachannel_go_test.go
index 958abb20..bbcef83b 100644
--- a/datachannel_go_test.go
+++ b/datachannel_go_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/datachannel_js.go b/datachannel_js.go
index 7aa6d99f..55214b55 100644
--- a/datachannel_js.go
+++ b/datachannel_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc
@@ -162,7 +163,7 @@ func (d *DataChannel) Label() string {
 // out-of-order delivery is allowed.
 func (d *DataChannel) Ordered() bool {
 	ordered := d.underlying.Get("ordered")
-	if jsValueIsUndefined(ordered) {
+	if ordered.IsUndefined() {
 		return true // default is true
 	}
 	return ordered.Bool()
@@ -171,13 +172,13 @@ func (d *DataChannel) Ordered() bool {
 // MaxPacketLifeTime represents the length of the time window (msec) during
 // which transmissions and retransmissions may occur in unreliable mode.
 func (d *DataChannel) MaxPacketLifeTime() *uint16 {
-	if !jsValueIsUndefined(d.underlying.Get("maxPacketLifeTime")) {
+	if !d.underlying.Get("maxPacketLifeTime").IsUndefined() {
 		return valueToUint16Pointer(d.underlying.Get("maxPacketLifeTime"))
-	} else {
-		// See https://bugs.chromium.org/p/chromium/issues/detail?id=696681
-		// Chrome calls this "maxRetransmitTime"
-		return valueToUint16Pointer(d.underlying.Get("maxRetransmitTime"))
 	}
+
+	// See https://bugs.chromium.org/p/chromium/issues/detail?id=696681
+	// Chrome calls this "maxRetransmitTime"
+	return valueToUint16Pointer(d.underlying.Get("maxRetransmitTime"))
 }
 
 // MaxRetransmits represents the maximum number of retransmissions that are
diff --git a/datachannel_js_detach.go b/datachannel_js_detach.go
index dd0069e0..43186c5d 100644
--- a/datachannel_js_detach.go
+++ b/datachannel_js_detach.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc
diff --git a/dtlstransport.go b/dtlstransport.go
index 1df7b9d9..de078d63 100644
--- a/dtlstransport.go
+++ b/dtlstransport.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/dtlstransport_test.go b/dtlstransport_test.go
index a4aabe53..4d6d3934 100644
--- a/dtlstransport_test.go
+++ b/dtlstransport_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
index de41a94a..8cc51278 100644
--- a/e2e/e2e_test.go
+++ b/e2e/e2e_test.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 package main
diff --git a/examples/broadcast/main.go b/examples/broadcast/main.go
index 74fef697..8f15776b 100644
--- a/examples/broadcast/main.go
+++ b/examples/broadcast/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/custom-logger/main.go b/examples/custom-logger/main.go
index 5851913d..c09cd271 100644
--- a/examples/custom-logger/main.go
+++ b/examples/custom-logger/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/data-channels-detach/jsfiddle/main.go b/examples/data-channels-detach/jsfiddle/main.go
index 91109d29..05019542 100644
--- a/examples/data-channels-detach/jsfiddle/main.go
+++ b/examples/data-channels-detach/jsfiddle/main.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package main
diff --git a/examples/data-channels/jsfiddle/main.go b/examples/data-channels/jsfiddle/main.go
index 506e37ab..45d3a0f1 100644
--- a/examples/data-channels/jsfiddle/main.go
+++ b/examples/data-channels/jsfiddle/main.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package main
diff --git a/examples/ice-single-port/main.go b/examples/ice-single-port/main.go
index 5cca522d..21f8e50a 100644
--- a/examples/ice-single-port/main.go
+++ b/examples/ice-single-port/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/ice-tcp/main.go b/examples/ice-tcp/main.go
index 105d2912..5f26156e 100644
--- a/examples/ice-tcp/main.go
+++ b/examples/ice-tcp/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/insertable-streams/main.go b/examples/insertable-streams/main.go
index 7325fdc6..1dd0fe0b 100644
--- a/examples/insertable-streams/main.go
+++ b/examples/insertable-streams/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/ortc/main.go b/examples/ortc/main.go
index 2954106c..0f61e069 100644
--- a/examples/ortc/main.go
+++ b/examples/ortc/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/play-from-disk-renegotation/main.go b/examples/play-from-disk-renegotation/main.go
index 36ac5842..04df6047 100644
--- a/examples/play-from-disk-renegotation/main.go
+++ b/examples/play-from-disk-renegotation/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/play-from-disk/main.go b/examples/play-from-disk/main.go
index 23878c1c..386ab88e 100644
--- a/examples/play-from-disk/main.go
+++ b/examples/play-from-disk/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/reflect/main.go b/examples/reflect/main.go
index 0e667bab..466fb80b 100644
--- a/examples/reflect/main.go
+++ b/examples/reflect/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/rtcp-processing/main.go b/examples/rtcp-processing/main.go
index 46dfb78d..1bd5ab3e 100644
--- a/examples/rtcp-processing/main.go
+++ b/examples/rtcp-processing/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/rtp-forwarder/main.go b/examples/rtp-forwarder/main.go
index ebce7442..41ce6036 100644
--- a/examples/rtp-forwarder/main.go
+++ b/examples/rtp-forwarder/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/rtp-to-webrtc/main.go b/examples/rtp-to-webrtc/main.go
index 73ac87c3..46cafebd 100644
--- a/examples/rtp-to-webrtc/main.go
+++ b/examples/rtp-to-webrtc/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/save-to-disk/main.go b/examples/save-to-disk/main.go
index c657f218..dfab19b4 100644
--- a/examples/save-to-disk/main.go
+++ b/examples/save-to-disk/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/simulcast/main.go b/examples/simulcast/main.go
index 2e41f683..807ce135 100644
--- a/examples/simulcast/main.go
+++ b/examples/simulcast/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/swap-tracks/main.go b/examples/swap-tracks/main.go
index 90ab309d..635ca3f1 100644
--- a/examples/swap-tracks/main.go
+++ b/examples/swap-tracks/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/examples/vnet/show-network-usage/main.go b/examples/vnet/show-network-usage/main.go
index bc6f5967..b3430d5c 100644
--- a/examples/vnet/show-network-usage/main.go
+++ b/examples/vnet/show-network-usage/main.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package main
diff --git a/ice_go.go b/ice_go.go
index 897ed0da..992cd9cb 100644
--- a/ice_go.go
+++ b/ice_go.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/icegatherer.go b/icegatherer.go
index e071491d..c3a05408 100644
--- a/icegatherer.go
+++ b/icegatherer.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/icegatherer_test.go b/icegatherer_test.go
index 23b571ed..9e37a59d 100644
--- a/icegatherer_test.go
+++ b/icegatherer_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/iceserver.go b/iceserver.go
index 76146ece..b83a9e8b 100644
--- a/iceserver.go
+++ b/iceserver.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/iceserver_js.go b/iceserver_js.go
index 07b2dcba..3f4f9c3a 100644
--- a/iceserver_js.go
+++ b/iceserver_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc
diff --git a/iceserver_test.go b/iceserver_test.go
index c2e5deb3..dafe1561 100644
--- a/iceserver_test.go
+++ b/iceserver_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/icetransport.go b/icetransport.go
index 1798d7d0..31cc4c9a 100644
--- a/icetransport.go
+++ b/icetransport.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/icetransport_test.go b/icetransport_test.go
index afd7c7e8..98c4eb35 100644
--- a/icetransport_test.go
+++ b/icetransport_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/interceptor.go b/interceptor.go
index 1ae85fd8..e93fc766 100644
--- a/interceptor.go
+++ b/interceptor.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/interceptor_test.go b/interceptor_test.go
index 7bca7fc1..bce700e2 100644
--- a/interceptor_test.go
+++ b/interceptor_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/js_compare.go b/js_compare.go
deleted file mode 100644
index 31e39802..00000000
--- a/js_compare.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build js,go1.14
-
-package webrtc
-
-import "syscall/js"
-
-func jsValueIsUndefined(v js.Value) bool {
-	return v.IsUndefined()
-}
-
-func jsValueIsNull(v js.Value) bool {
-	return v.IsNull()
-}
diff --git a/js_compare_legacy.go b/js_compare_legacy.go
deleted file mode 100644
index e2e247a0..00000000
--- a/js_compare_legacy.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build js,!go1.14
-
-package webrtc
-
-import "syscall/js"
-
-func jsValueIsUndefined(v js.Value) bool {
-	return v == js.Undefined()
-}
-
-func jsValueIsNull(v js.Value) bool {
-	return v == js.Null()
-}
diff --git a/js_utils.go b/js_utils.go
index 25e89396..c6a70129 100644
--- a/js_utils.go
+++ b/js_utils.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc
@@ -42,7 +43,7 @@ func awaitPromise(promise js.Value) (js.Value, error) {
 }
 
 func valueToUint16Pointer(val js.Value) *uint16 {
-	if jsValueIsNull(val) || jsValueIsUndefined(val) {
+	if val.IsNull() || val.IsUndefined() {
 		return nil
 	}
 	convertedVal := uint16(val.Int())
@@ -50,7 +51,7 @@ func valueToUint16Pointer(val js.Value) *uint16 {
 }
 
 func valueToStringPointer(val js.Value) *string {
-	if jsValueIsNull(val) || jsValueIsUndefined(val) {
+	if val.IsNull() || val.IsUndefined() {
 		return nil
 	}
 	stringVal := val.String()
@@ -79,28 +80,28 @@ func interfaceToValueOrUndefined(val interface{}) js.Value {
 }
 
 func valueToStringOrZero(val js.Value) string {
-	if jsValueIsUndefined(val) || jsValueIsNull(val) {
+	if val.IsUndefined() || val.IsNull() {
 		return ""
 	}
 	return val.String()
 }
 
 func valueToUint8OrZero(val js.Value) uint8 {
-	if jsValueIsUndefined(val) || jsValueIsNull(val) {
+	if val.IsUndefined() || val.IsNull() {
 		return 0
 	}
 	return uint8(val.Int())
 }
 
 func valueToUint16OrZero(val js.Value) uint16 {
-	if jsValueIsNull(val) || jsValueIsUndefined(val) {
+	if val.IsNull() || val.IsUndefined() {
 		return 0
 	}
 	return uint16(val.Int())
 }
 
 func valueToUint32OrZero(val js.Value) uint32 {
-	if jsValueIsNull(val) || jsValueIsUndefined(val) {
+	if val.IsNull() || val.IsUndefined() {
 		return 0
 	}
 	return uint32(val.Int())
diff --git a/mediaengine.go b/mediaengine.go
index 887a083d..bdab6b9f 100644
--- a/mediaengine.go
+++ b/mediaengine.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/mediaengine_test.go b/mediaengine_test.go
index 6a15363e..3399877d 100644
--- a/mediaengine_test.go
+++ b/mediaengine_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/ortc_datachannel_test.go b/ortc_datachannel_test.go
index 5a75110c..cc64d2cb 100644
--- a/ortc_datachannel_test.go
+++ b/ortc_datachannel_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/ortc_media_test.go b/ortc_media_test.go
index 3fdbb3d3..5d247337 100644
--- a/ortc_media_test.go
+++ b/ortc_media_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/ortc_test.go b/ortc_test.go
index 1e416194..0ebfec7a 100644
--- a/ortc_test.go
+++ b/ortc_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/peerconnection.go b/peerconnection.go
index 272903c3..9bb5e1be 100644
--- a/peerconnection.go
+++ b/peerconnection.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/peerconnection_close_test.go b/peerconnection_close_test.go
index 3b8e49f9..4a8d2916 100644
--- a/peerconnection_close_test.go
+++ b/peerconnection_close_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/peerconnection_go_test.go b/peerconnection_go_test.go
index f5223377..22b71275 100644
--- a/peerconnection_go_test.go
+++ b/peerconnection_go_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/peerconnection_js.go b/peerconnection_js.go
index db3c1af5..516369ba 100644
--- a/peerconnection_js.go
+++ b/peerconnection_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 // Package webrtc implements the WebRTC 1.0 as defined in W3C WebRTC specification document.
@@ -55,6 +56,7 @@ func (api *API) NewPeerConnection(configuration Configuration) (_ *PeerConnectio
 	}, nil
 }
 
+// JSValue returns the underlying PeerConnection
 func (pc *PeerConnection) JSValue() js.Value {
 	return pc.underlying
 }
@@ -561,7 +563,7 @@ func iceServerToValue(server ICEServer) js.Value {
 }
 
 func valueToConfiguration(configValue js.Value) Configuration {
-	if jsValueIsNull(configValue) || jsValueIsUndefined(configValue) {
+	if configValue.IsNull() || configValue.IsUndefined() {
 		return Configuration{}
 	}
 	return Configuration{
@@ -578,7 +580,7 @@ func valueToConfiguration(configValue js.Value) Configuration {
 }
 
 func valueToICEServers(iceServersValue js.Value) []ICEServer {
-	if jsValueIsNull(iceServersValue) || jsValueIsUndefined(iceServersValue) {
+	if iceServersValue.IsNull() || iceServersValue.IsUndefined() {
 		return nil
 	}
 	iceServers := make([]ICEServer, iceServersValue.Length())
@@ -599,10 +601,10 @@ func valueToICEServer(iceServerValue js.Value) ICEServer {
 }
 
 func valueToICECandidate(val js.Value) *ICECandidate {
-	if jsValueIsNull(val) || jsValueIsUndefined(val) {
+	if val.IsNull() || val.IsUndefined() {
 		return nil
 	}
-	if jsValueIsUndefined(val.Get("protocol")) && !jsValueIsUndefined(val.Get("candidate")) {
+	if val.Get("protocol").IsUndefined() && !val.Get("candidate").IsUndefined() {
 		// Missing some fields, assume it's Firefox and parse SDP candidate.
 		c, err := ice.UnmarshalCandidate(val.Get("candidate").String())
 		if err != nil {
@@ -653,7 +655,7 @@ func sessionDescriptionToValue(desc *SessionDescription) js.Value {
 }
 
 func valueToSessionDescription(descValue js.Value) *SessionDescription {
-	if jsValueIsNull(descValue) || jsValueIsUndefined(descValue) {
+	if descValue.IsNull() || descValue.IsUndefined() {
 		return nil
 	}
 	return &SessionDescription{
diff --git a/peerconnection_media_test.go b/peerconnection_media_test.go
index 0d3b45c2..adfdbab9 100644
--- a/peerconnection_media_test.go
+++ b/peerconnection_media_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/peerconnection_renegotiation_test.go b/peerconnection_renegotiation_test.go
index f5a120fb..788e8a31 100644
--- a/peerconnection_renegotiation_test.go
+++ b/peerconnection_renegotiation_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/rtpreceiver_go.go b/rtpreceiver_go.go
index 7f347e4b..43016954 100644
--- a/rtpreceiver_go.go
+++ b/rtpreceiver_go.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/rtpreceiver_go_test.go b/rtpreceiver_go_test.go
index d47d51ad..50d9b29a 100644
--- a/rtpreceiver_go_test.go
+++ b/rtpreceiver_go_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/rtpreceiver_js.go b/rtpreceiver_js.go
index bee5d9a4..866757fb 100644
--- a/rtpreceiver_js.go
+++ b/rtpreceiver_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc
diff --git a/rtpreceiver_test.go b/rtpreceiver_test.go
index 43e78a70..858ddf1a 100644
--- a/rtpreceiver_test.go
+++ b/rtpreceiver_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/rtpsender_js.go b/rtpsender_js.go
index cd224920..cdb9dd59 100644
--- a/rtpsender_js.go
+++ b/rtpsender_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc
diff --git a/rtptransceiver.go b/rtptransceiver.go
index c712de12..4ff4ead7 100644
--- a/rtptransceiver.go
+++ b/rtptransceiver.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/rtptransceiver_js.go b/rtptransceiver_js.go
index 3c5655fd..0e761315 100644
--- a/rtptransceiver_js.go
+++ b/rtptransceiver_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc
diff --git a/rtptransceiver_test.go b/rtptransceiver_test.go
index 2e048c88..72697c95 100644
--- a/rtptransceiver_test.go
+++ b/rtptransceiver_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/sctptransport.go b/sctptransport.go
index 2b55e9eb..27e02ea6 100644
--- a/sctptransport.go
+++ b/sctptransport.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/sctptransport_test.go b/sctptransport_test.go
index faff51ba..822eb21a 100644
--- a/sctptransport_test.go
+++ b/sctptransport_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/sdp_test.go b/sdp_test.go
index a98ecb61..1d744266 100644
--- a/sdp_test.go
+++ b/sdp_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/sdpsemantics_test.go b/sdpsemantics_test.go
index 6b3a07a4..5930e98d 100644
--- a/sdpsemantics_test.go
+++ b/sdpsemantics_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/settingengine.go b/settingengine.go
index 3e2578cb..89d91da8 100644
--- a/settingengine.go
+++ b/settingengine.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/settingengine_js.go b/settingengine_js.go
index 5b77d660..a4ae0d0e 100644
--- a/settingengine_js.go
+++ b/settingengine_js.go
@@ -1,3 +1,4 @@
+//go:build js && wasm
 // +build js,wasm
 
 package webrtc
diff --git a/settingengine_test.go b/settingengine_test.go
index 17d6dfdf..cfec0deb 100644
--- a/settingengine_test.go
+++ b/settingengine_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/srtp_writer_future.go b/srtp_writer_future.go
index 7cf0ee10..94299674 100644
--- a/srtp_writer_future.go
+++ b/srtp_writer_future.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/stats_go.go b/stats_go.go
index e1f622e5..10ec55c9 100644
--- a/stats_go.go
+++ b/stats_go.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/stats_go_test.go b/stats_go_test.go
index 87fd7d16..5d4de401 100644
--- a/stats_go_test.go
+++ b/stats_go_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/track_local_static_test.go b/track_local_static_test.go
index c9f09b77..d6feebba 100644
--- a/track_local_static_test.go
+++ b/track_local_static_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/track_remote.go b/track_remote.go
index 7209707f..e98620c3 100644
--- a/track_remote.go
+++ b/track_remote.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/track_test.go b/track_test.go
index 9e01a698..48d8ea29 100644
--- a/track_test.go
+++ b/track_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc
diff --git a/vnet_test.go b/vnet_test.go
index 14e8372c..11bdb4bd 100644
--- a/vnet_test.go
+++ b/vnet_test.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package webrtc