diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go index 7791959a87e20..47759b194261d 100644 --- a/enterprise/coderd/coderd.go +++ b/enterprise/coderd/coderd.go @@ -657,7 +657,9 @@ func (api *API) updateEntitlements(ctx context.Context) error { }) } else { coordinator = agpltailnet.NewCoordinator(api.Logger) - api.derpMesh.SetAddresses([]string{}, false) + if api.Options.DeploymentValues.DERP.Server.Enable { + api.derpMesh.SetAddresses([]string{}, false) + } api.replicaManager.SetCallback(func() { // If the amount of replicas change, so should our entitlements. // This is to display a warning in the UI if the user is unlicensed.