diff --git a/internal/config/options.go b/internal/config/options.go
index d0f1433b2..ab629245a 100644
--- a/internal/config/options.go
+++ b/internal/config/options.go
@@ -42,7 +42,7 @@ func WithRPC(rpcConfig map[string]RPCConfig) ContextOption {
 				opts = append(opts, noderpc.WithLog())
 			}
 
-			ctx.RPC = noderpc.NewNodeRPC(rpcProvider.URI, opts...)
+			ctx.RPC = noderpc.NewWaitNodeRPC(rpcProvider.URI, opts...)
 		}
 	}
 }