diff --git a/cmd/replication/main.go b/cmd/replication/main.go
index 23531699..1875d00b 100644
--- a/cmd/replication/main.go
+++ b/cmd/replication/main.go
@@ -109,6 +109,7 @@ func main() {
 			chainRegistry,
 			db,
 			blockchainPublisher,
+			fmt.Sprintf("0.0.0.0:%d", options.API.Port),
 		)
 		if err != nil {
 			log.Fatal("initializing server", zap.Error(err))
diff --git a/pkg/api/server.go b/pkg/api/server.go
index b0ee09a6..4bbb8ffc 100644
--- a/pkg/api/server.go
+++ b/pkg/api/server.go
@@ -2,7 +2,6 @@ package api
 
 import (
 	"context"
-	"fmt"
 	"net"
 	"strings"
 	"sync"
@@ -33,11 +32,11 @@ type ApiServer struct {
 func NewAPIServer(
 	ctx context.Context,
 	log *zap.Logger,
-	port int,
+	listenAddress string,
 	enableReflection bool,
 	registrationFunc RegistrationFunc,
 ) (*ApiServer, error) {
-	grpcListener, err := net.Listen("tcp", fmt.Sprintf("0.0.0.0:%d", port))
+	grpcListener, err := net.Listen("tcp", listenAddress)
 
 	if err != nil {
 		return nil, err
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 6d2a14e2..8332f71c 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -52,6 +52,7 @@ func NewReplicationServer(
 	nodeRegistry registry.NodeRegistry,
 	writerDB *sql.DB,
 	blockchainPublisher blockchain.IBlockchainPublisher,
+	listenAddress string,
 ) (*ReplicationServer, error) {
 	var err error
 
@@ -147,7 +148,7 @@ func NewReplicationServer(
 	s.apiServer, err = api.NewAPIServer(
 		s.ctx,
 		log,
-		options.API.Port,
+		listenAddress,
 		options.Reflection.Enable,
 		serviceRegistrationFunc,
 	)
diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
index 6539e945..9538dff7 100644
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -52,7 +52,7 @@ func NewTestServer(
 		API: config.ApiOptions{
 			Port: port,
 		},
-	}, registry, db, messagePublisher)
+	}, registry, db, messagePublisher, fmt.Sprintf("localhost:%d", port))
 	require.NoError(t, err)
 
 	return server
diff --git a/pkg/testutils/api/api.go b/pkg/testutils/api/api.go
index 11862f84..35d4cc28 100644
--- a/pkg/testutils/api/api.go
+++ b/pkg/testutils/api/api.go
@@ -104,8 +104,8 @@ func NewTestAPIServer(t *testing.T) (*api.ApiServer, *sql.DB, func()) {
 	svr, err := api.NewAPIServer(
 		ctx,
 		log,
-		0,    /*port*/
-		true, /*enableReflection*/
+		"localhost:0", /*listenAddress*/
+		true,          /*enableReflection*/
 		serviceRegistrationFunc,
 	)
 	require.NoError(t, err)