diff --git a/client/cmd/up.go b/client/cmd/up.go
index 6392ee95552..181d585e5f6 100644
--- a/client/cmd/up.go
+++ b/client/cmd/up.go
@@ -191,8 +191,12 @@ func runClient() error {
 		return err
 	}
 
+	go func() {
+		cleanupCh <- struct{}{}
+	}()
+
 	log.Info("stopped Wiretrustee client")
-	cleanupCh <- struct{}{}
 
-	return nil
+	return ctx.Err()
+
 }