diff --git a/feature/relayserver/relayserver.go b/feature/relayserver/relayserver.go
index f4a533193..d0ad27624 100644
--- a/feature/relayserver/relayserver.go
+++ b/feature/relayserver/relayserver.go
@@ -14,7 +14,6 @@ import (
 	"sync"
 	"time"
 
-	"tailscale.com/envknob"
 	"tailscale.com/feature"
 	"tailscale.com/ipn"
 	"tailscale.com/ipn/ipnext"
@@ -133,9 +132,6 @@ func (e *extension) relayServerOrInit() (relayServer, error) {
 	if e.hasNodeAttrDisableRelayServer {
 		return nil, errors.New("disable-relay-server node attribute is present")
 	}
-	if !envknob.UseWIPCode() {
-		return nil, errors.New("TAILSCALE_USE_WIP_CODE envvar is not set")
-	}
 	var err error
 	e.server, err = udprelay.NewServer(e.logf, *e.port, nil)
 	if err != nil {
diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go
index b5087b02e..14feed32b 100644
--- a/wgengine/magicsock/magicsock.go
+++ b/wgengine/magicsock/magicsock.go
@@ -2724,8 +2724,7 @@ func (c *Conn) onNodeViewsUpdate(update NodeViewsUpdate) {
 
 	relayClientEnabled := update.SelfNode.Valid() &&
 		!update.SelfNode.HasCap(tailcfg.NodeAttrDisableRelayClient) &&
-		!update.SelfNode.HasCap(tailcfg.NodeAttrOnlyTCP443) &&
-		envknob.UseWIPCode()
+		!update.SelfNode.HasCap(tailcfg.NodeAttrOnlyTCP443)
 
 	c.mu.Lock()
 	relayClientChanged := c.relayClientEnabled != relayClientEnabled