diff --git a/cmd/cleanup.go b/cmd/cleanup.go
index a917d29..115d48e 100644
--- a/cmd/cleanup.go
+++ b/cmd/cleanup.go
@@ -23,7 +23,10 @@ var cleanupCommand = &cobra.Command{
 }
 
 func cleanup(ctx context.Context) error {
-	srv, _ := tmux.CurrentServerOrDefault()
+	srv := tmux.MaybeCurrentServer()
+	if srv == nil {
+		srv = tmux.DefaultServer()
+	}
 	st, err := state.New(ctx, srv, api.Registered())
 	if err != nil {
 		return err
diff --git a/cmd/new.go b/cmd/new.go
index ddaf189..ab6b8a3 100644
--- a/cmd/new.go
+++ b/cmd/new.go
@@ -32,7 +32,10 @@ func newWorkUnit(ctx context.Context, workUnitName string, ctor workUnitCtor) er
 	if err != nil {
 		return err
 	}
-	srv, _ := tmux.CurrentServerOrDefault()
+	srv := tmux.MaybeCurrentServer()
+	if srv == nil {
+		srv = tmux.DefaultServer()
+	}
 	state, err := state.New(ctx, srv, vcs)
 	if err != nil {
 		return err
diff --git a/cmd/update.go b/cmd/update.go
index 6ccfec8..dc124b3 100644
--- a/cmd/update.go
+++ b/cmd/update.go
@@ -87,7 +87,7 @@ func update(ctx context.Context) error {
 	curSesh := tmux.MaybeCurrentSession()
 	if curSesh == nil {
 		// Executed outside of tmux. Attach to the proper tmux session.
-		srv, _ := tmux.CurrentServerOrDefault()
+		srv := tmux.DefaultServer()
 		state, err := state.New(ctx, srv, vcs)
 		if err != nil {
 			return err
@@ -126,7 +126,11 @@ func updateTmux(ctx context.Context, st *state.State, repo api.Repository, workU
 
 func updateTo(ctx context.Context, workUnitName string) error {
 	vcs := api.Registered()
-	srv, hasCurrentServer := tmux.CurrentServerOrDefault()
+	srv := tmux.MaybeCurrentServer()
+	hasCurrentServer := srv != nil
+	if !hasCurrentServer {
+		srv = tmux.DefaultServer()
+	}
 	st, err := state.New(ctx, srv, vcs)
 	if err != nil {
 		return err
diff --git a/tmux/server.go b/tmux/server.go
index 0ee0dc0..1788a07 100644
--- a/tmux/server.go
+++ b/tmux/server.go
@@ -100,13 +100,8 @@ func MaybeCurrentServer() Server {
 	return srv
 }
 
-// CurrentServerOrDefault either returns the CurrentServer, or the default server.
-func CurrentServerOrDefault() (Server, bool) {
-	srv := MaybeCurrentServer()
-	if srv == nil {
-		return &server{}, false
-	}
-	return srv, true
+func DefaultServer() Server {
+	return &server{}
 }
 
 func (srv *server) LogValue() slog.Value {