diff --git a/server/grpc_server.go b/server/grpc_server.go
index ac3d728a..077f0e52 100644
--- a/server/grpc_server.go
+++ b/server/grpc_server.go
@@ -2,7 +2,6 @@ package server
 
 import (
 	"net"
-	"strings"
 
 	"google.golang.org/grpc"
 
@@ -23,8 +22,7 @@ type GRPCServer struct {
 
 // NewGRPCServer returns a new gRPC ABCI server
 func NewGRPCServer(protoAddr string, app types.ABCIApplicationServer) cmn.Service {
-	parts := strings.SplitN(protoAddr, "://", 2)
-	proto, addr := parts[0], parts[1]
+	proto, addr := cmn.ProtocolAndAddress(protoAddr)
 	s := &GRPCServer{
 		proto:    proto,
 		addr:     addr,
diff --git a/server/socket_server.go b/server/socket_server.go
index 304a2c7f..adc7516c 100644
--- a/server/socket_server.go
+++ b/server/socket_server.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"net"
-	"strings"
 	"sync"
 
 	"github.com/tendermint/abci/types"
@@ -30,8 +29,7 @@ type SocketServer struct {
 }
 
 func NewSocketServer(protoAddr string, app types.Application) cmn.Service {
-	parts := strings.SplitN(protoAddr, "://", 2)
-	proto, addr := parts[0], parts[1]
+	proto, addr := cmn.ProtocolAndAddress(protoAddr)
 	s := &SocketServer{
 		proto:    proto,
 		addr:     addr,