diff --git a/examples/throughput/main.go b/examples/throughput/main.go
index 7fed374..e23aab5 100644
--- a/examples/throughput/main.go
+++ b/examples/throughput/main.go
@@ -234,7 +234,7 @@ func main() {
 		}
 
 		if *u {
-			uConn, err := c.ListenUDP(nil)
+			uConn, err := c.ListenUDP()
 			if err != nil {
 				log.Fatal(err)
 			}
diff --git a/tests/session_test.go b/tests/session_test.go
index fcaeea9..4c16d86 100644
--- a/tests/session_test.go
+++ b/tests/session_test.go
@@ -110,7 +110,7 @@ func TestTunaSession(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	uConn, err := c.ListenUDP(nil)
+	uConn, err := c.ListenUDP()
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tests/udp_test.go b/tests/udp_test.go
index 760e411..53cfd60 100644
--- a/tests/udp_test.go
+++ b/tests/udp_test.go
@@ -70,7 +70,7 @@ func StartUDPListner(numListener int, ch chan string) (tunaSess *ts.TunaSessionC
 		}()
 	}()
 
-	udpSess, err := tunaSess.ListenUDP(nil)
+	udpSess, err := tunaSess.ListenUDP()
 	if err != nil {
 		log.Println("ListenUDP err ", err)
 	}
diff --git a/udp.go b/udp.go
index 209b627..b10be80 100644
--- a/udp.go
+++ b/udp.go
@@ -7,31 +7,24 @@ import (
 	"time"
 
 	"github.com/nknorg/nkn-sdk-go"
-	"github.com/nknorg/nkngomobile"
 	"github.com/nknorg/tuna"
 )
 
-const (
-	sendUdpMetaDataRetries = 2 // retries to send udp meta data
-)
-
-func (c *TunaSessionClient) ListenUDP(addrsRe *nkngomobile.StringArray) (*UdpSession, error) {
-	acceptAddrs, err := getAcceptAddrs(addrsRe)
-	if err != nil {
-		return nil, err
-	}
-	if c.wallet == nil {
-		return nil, errors.New("ListenUDP wallet is empty")
+// Start UDP server listening.
+// Because UDP is connectionless, we use TCP to track the connection status.
+// So we need to start a TCP server first, and then start a UDP server.
+// Meanwhile, Tuna session server hase two modes: TCP only, or TCP + UDP.
+func (c *TunaSessionClient) ListenUDP() (*UdpSession, error) {
+	if len(c.listeners) == 0 {
+		return nil, errors.New("please call Listen() to start TCP first")
 	}
 
-	c.acceptAddrs = acceptAddrs
-
 	if c.listenerUdpSess != nil {
 		return c.listenerUdpSess, nil
 	}
 	c.listenerUdpSess = newUdpSession(c, true)
 
-	err = c.startExits()
+	err := c.startExits()
 	if err != nil {
 		return nil, err
 	}