diff --git a/backend/internal/gateway/repository.go b/backend/internal/gateway/repository.go
index 497ee6c..ddeaea6 100644
--- a/backend/internal/gateway/repository.go
+++ b/backend/internal/gateway/repository.go
@@ -27,7 +27,7 @@ func NewPGRepository(db *pgxpool.Pool) *PGRepository {
 
 func (r *PGRepository) List(ctx context.Context) ([]Gateway, error) {
 	rows, err := r.db.Query(ctx, `
-		select id, name, endpoint, public_key, listen_port, vpn_cidr, dns_servers, is_active
+		select id, name, endpoint, public_key, listen_port, vpn_cidr::text, dns_servers, is_active
 		from gateways
 		where deleted_at is null
 		order by created_at desc
@@ -50,7 +50,7 @@ func (r *PGRepository) List(ctx context.Context) ([]Gateway, error) {
 
 func (r *PGRepository) FirstActive(ctx context.Context) (Gateway, error) {
 	row := r.db.QueryRow(ctx, `
-		select id, name, endpoint, public_key, listen_port, vpn_cidr, dns_servers, is_active
+		select id, name, endpoint, public_key, listen_port, vpn_cidr::text, dns_servers, is_active
 		from gateways
 		where deleted_at is null and is_active = true
 		order by created_at asc
@@ -128,7 +128,7 @@ func (r *PGRepository) Update(ctx context.Context, gatewayID uuid.UUID, input Up
 		    is_active = $7,
 		    updated_at = now()
 		where id = $1
-		returning id, name, endpoint, public_key, listen_port, vpn_cidr, dns_servers, is_active
+		returning id, name, endpoint, public_key, listen_port, vpn_cidr::text, dns_servers, is_active
 	`, gatewayID, input.Endpoint, input.PublicKey, input.ListenPort, input.VPNCIDR, input.DNSServers, input.IsActive)
 
 	var item Gateway