diff --git a/cmd/webrtc/client.go b/cmd/webrtc/client.go
index cb83d1a3..dc7b2404 100644
--- a/cmd/webrtc/client.go
+++ b/cmd/webrtc/client.go
@@ -40,7 +40,7 @@ func asyncClient(url string) (streamer.Producer, error) {
 	}()
 
 	// 2. Create PeerConnection
-	pc, err := newPeerConnection(false)
+	pc, err := PeerConnection(true)
 	if err != nil {
 		log.Error().Err(err).Caller().Send()
 		return nil, err
@@ -125,7 +125,7 @@ func asyncClient(url string) (streamer.Producer, error) {
 // syncClient - support WebRTC-HTTP Egress Protocol (WHEP)
 func syncClient(url string) (streamer.Producer, error) {
 	// 2. Create PeerConnection
-	pc, err := newPeerConnection(false)
+	pc, err := PeerConnection(true)
 	if err != nil {
 		log.Error().Err(err).Caller().Send()
 		return nil, err
diff --git a/cmd/webrtc/init.go b/cmd/webrtc/init.go
index 4da97e33..49ef761f 100644
--- a/cmd/webrtc/init.go
+++ b/cmd/webrtc/init.go
@@ -54,11 +54,12 @@ func Init() {
 		SDPSemantics: pion.SDPSemanticsUnifiedPlanWithFallback,
 	}
 
-	newPeerConnection = func(isServer bool) (*pion.PeerConnection, error) {
-		if isServer {
-			return serverAPI.NewPeerConnection(pionConf)
-		} else {
+	PeerConnection = func(active bool) (*pion.PeerConnection, error) {
+		// active - client, passive - server
+		if active {
 			return clientAPI.NewPeerConnection(pionConf)
+		} else {
+			return serverAPI.NewPeerConnection(pionConf)
 		}
 	}
 
@@ -81,7 +82,7 @@ func Init() {
 var Port string
 var log zerolog.Logger
 
-var newPeerConnection func(isServer bool) (*pion.PeerConnection, error)
+var PeerConnection func(active bool) (*pion.PeerConnection, error)
 
 func asyncHandler(tr *api.Transport, msg *api.Message) error {
 	src := tr.Request.URL.Query().Get("src")
@@ -93,7 +94,7 @@ func asyncHandler(tr *api.Transport, msg *api.Message) error {
 	log.Debug().Str("url", src).Msg("[webrtc] new consumer")
 
 	// create new PeerConnection instance
-	pc, err := newPeerConnection(true)
+	pc, err := PeerConnection(false)
 	if err != nil {
 		log.Error().Err(err).Caller().Send()
 		return err
@@ -168,7 +169,7 @@ func asyncHandler(tr *api.Transport, msg *api.Message) error {
 }
 
 func ExchangeSDP(stream *streams.Stream, offer string, userAgent string) (answer string, err error) {
-	pc, err := newPeerConnection(true)
+	pc, err := PeerConnection(false)
 	if err != nil {
 		log.Error().Err(err).Caller().Send()
 		return
diff --git a/cmd/webrtc/server.go b/cmd/webrtc/server.go
index 1fd1885c..a27e7a23 100644
--- a/cmd/webrtc/server.go
+++ b/cmd/webrtc/server.go
@@ -139,7 +139,7 @@ func inputWebRTC(w http.ResponseWriter, r *http.Request) {
 
 	log.Trace().Msgf("[webrtc] WHIP offer\n%s", offer)
 
-	pc, err := newPeerConnection(true)
+	pc, err := PeerConnection(false)
 	if err != nil {
 		log.Error().Err(err).Caller().Send()
 		http.Error(w, err.Error(), http.StatusInternalServerError)