diff --git a/src/rpc-client/src/Proxy/ProxyCallVisitor.php b/src/rpc-client/src/Proxy/ProxyCallVisitor.php
index 7838d3c7e..ed31f76b8 100644
--- a/src/rpc-client/src/Proxy/ProxyCallVisitor.php
+++ b/src/rpc-client/src/Proxy/ProxyCallVisitor.php
@@ -72,7 +72,6 @@ class ProxyCallVisitor extends NodeVisitorAbstract
                 ],
             ]);
         }
-        return parent::leaveNode($node);
     }
 
     public function generateStmts(Interface_ $node): array
@@ -101,10 +100,9 @@ class ProxyCallVisitor extends NodeVisitorAbstract
             'params' => value(function () use ($method) {
                 $parameters = [];
                 foreach ($method->getParameters() as $parameter) {
-                    $default = $this->handleDefaultValue($parameter);
                     $parameters[] = new Node\Param(
                         new Node\Expr\Variable($parameter->getName()),
-                        $default,
+                        $this->handleDefaultValue($parameter),
                         value(function () use ($parameter) {
                             if ($parameter->isCallable()) {
                                 return new Node\Identifier('callable');