diff --git a/api/server/internal/server/accountapiimp/service.go b/api/server/internal/server/accountapiimp/service.go
index df3a0e8..9db86cc 100644
--- a/api/server/internal/server/accountapiimp/service.go
+++ b/api/server/internal/server/accountapiimp/service.go
@@ -161,13 +161,16 @@ func (a *AccountAPI) initChainGateway(cfg *eapi.ChainGatewayConfig) error {
 		return merrors.InvalidArgument("chain gateway configuration is not provided")
 	}
 
-	address := strings.TrimSpace(os.Getenv(cfg.AddressEnv))
-	if address == "" {
-		return merrors.InvalidArgument(fmt.Sprintf("chain gateway address env %s is empty", cfg.AddressEnv))
+	cfg.Address = strings.TrimSpace(cfg.Address)
+	if cfg.Address == "" {
+		cfg.Address = strings.TrimSpace(os.Getenv(cfg.AddressEnv))
+	}
+	if cfg.Address == "" {
+		return merrors.InvalidArgument(fmt.Sprintf("chain gateway address is not specified and address env %s is empty", cfg.AddressEnv))
 	}
 
 	clientCfg := chaingatewayclient.Config{
-		Address:     address,
+		Address:     cfg.Address,
 		DialTimeout: time.Duration(cfg.DialTimeoutSeconds) * time.Second,
 		CallTimeout: time.Duration(cfg.CallTimeoutSeconds) * time.Second,
 		Insecure:    cfg.Insecure,
@@ -216,6 +219,6 @@ func parseChainNetwork(value string) (gatewayv1.ChainNetwork, error) {
 	case "", "CHAIN_NETWORK_UNSPECIFIED":
 		return gatewayv1.ChainNetwork_CHAIN_NETWORK_UNSPECIFIED, merrors.InvalidArgument("chain network must be specified")
 	default:
-		return gatewayv1.ChainNetwork_CHAIN_NETWORK_UNSPECIFIED, merrors.InvalidArgument("unsupported chain network %s", value)
+		return gatewayv1.ChainNetwork_CHAIN_NETWORK_UNSPECIFIED, merrors.InvalidArgument(fmt.Sprintf("unsupported chain network %s", value))
 	}
 }