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