diff --git a/cmd/apps/substreams_tier1.go b/cmd/apps/substreams_tier1.go
index f86d3a4..b6d3a34 100644
--- a/cmd/apps/substreams_tier1.go
+++ b/cmd/apps/substreams_tier1.go
@@ -164,7 +164,7 @@ func RegisterSubstreamsTier1App[B firecore.Block](chain *firecore.Chain[B], root
 			workerPoolFactory := work.NewSimpleWorkerPoolFactory(clientFactory).WorkerPool
 
 			if substreamsGlobalWorkerPoolAddress != "" {
-				grpcClientConnection, err := dgrpc.NewInternalClientConn(substreamsGlobalWorkerPoolAddress)
+				grpcClientConnection, err := dgrpc.NewInternalNoWaitClientConn(substreamsGlobalWorkerPoolAddress)
 				if err != nil {
 					return nil, fmt.Errorf("unable to create grpc client connection to global worker pool: %w", err)
 				}
diff --git a/go.mod b/go.mod
index 89154fe..1a1d4c1 100644
--- a/go.mod
+++ b/go.mod
@@ -2,8 +2,6 @@ module github.com/streamingfast/firehose-core
 
 go 1.23.4
 
-//replace github.com/streamingfast/substreams => ../substreams
-
 require (
 	buf.build/gen/go/bufbuild/reflect/connectrpc/go v1.16.1-20240117202343-bf8f65e8876c.1
 	buf.build/gen/go/bufbuild/reflect/protocolbuffers/go v1.33.0-20240117202343-bf8f65e8876c.1
@@ -33,7 +31,7 @@ require (
 	github.com/streamingfast/payment-gateway v0.0.0-20240426151444-581e930c76e2
 	github.com/streamingfast/pbgo v0.0.6-0.20250114182320-0b43084f4000
 	github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0
-	github.com/streamingfast/substreams v1.12.3-0.20250212174204-147cdb27c693
+	github.com/streamingfast/substreams v1.12.3-0.20250217154006-513918760221
 	github.com/streamingfast/worker-pool-protocol v0.0.0-20250211140743-fb8ffbc05fbc
 	github.com/stretchr/testify v1.9.0
 	github.com/test-go/testify v1.1.4
diff --git a/go.sum b/go.sum
index 3d554b1..dbd2ecf 100644
--- a/go.sum
+++ b/go.sum
@@ -2186,8 +2186,8 @@ github.com/streamingfast/shutter v1.5.0 h1:NpzDYzj0HVpSiDJVO/FFSL6QIK/YKOxY0gJAt
 github.com/streamingfast/shutter v1.5.0/go.mod h1:B/T6efqdeMGbGwjzPS1ToXzYZI4kDzI5/u4I+7qbjY8=
 github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0 h1:Y15G1Z4fpEdm2b+/70owI7TLuXadlqBtGM7rk4Hxrzk=
 github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0/go.mod h1:/Rnz2TJvaShjUct0scZ9kKV2Jr9/+KBAoWy4UMYxgv4=
-github.com/streamingfast/substreams v1.12.3-0.20250212174204-147cdb27c693 h1:Laq33zSVG4D3tDVmVC9oTBC6JGcaWOMfQMI3Mu/lNzY=
-github.com/streamingfast/substreams v1.12.3-0.20250212174204-147cdb27c693/go.mod h1:l0QpHJpUYVNfxnbTQDkJCdfE4qpKLb693MFYj7YXWAA=
+github.com/streamingfast/substreams v1.12.3-0.20250217154006-513918760221 h1:vRjtJqv6J+CXU5KLTPo5TrLgJmw/N3PR4JhJemwPDzY=
+github.com/streamingfast/substreams v1.12.3-0.20250217154006-513918760221/go.mod h1:l0QpHJpUYVNfxnbTQDkJCdfE4qpKLb693MFYj7YXWAA=
 github.com/streamingfast/wazero v0.0.0-20241202185309-91287c3640ed h1:LU6/c376zP1cMAo9L6rFLyjo0W7RU+hIh7BegH8Zo5M=
 github.com/streamingfast/wazero v0.0.0-20241202185309-91287c3640ed/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
 github.com/streamingfast/worker-pool-protocol v0.0.0-20250211140743-fb8ffbc05fbc h1:WrgK+ECYQpYd5n+IG7rDR88lkaXw3wef1UKlEBvZ6Bs=