diff --git a/cli/packages/cmd/gateway.go b/cli/packages/cmd/gateway.go
index fc45080ac..e8591ca68 100644
--- a/cli/packages/cmd/gateway.go
+++ b/cli/packages/cmd/gateway.go
@@ -72,8 +72,8 @@ var gatewayCmd = &cobra.Command{
 					time.Sleep(5 * time.Second)
 					continue
 				}
-
-				if err := gatewayInstance.Listen(ctx); err == nil {
+				err = gatewayInstance.Listen(ctx)
+				if err == nil {
 					// meaning everything went smooth and we are exiting
 					return
 				}