diff --git a/libp2p/standard_setup.nim b/libp2p/standard_setup.nim
index c05d34056..9df26f06d 100644
--- a/libp2p/standard_setup.nim
+++ b/libp2p/standard_setup.nim
@@ -6,6 +6,7 @@ const
 
 import
   options, tables,
+  chronos,
   switch, peer, peerinfo, connection, multiaddress,
   crypto/crypto, transports/[transport, tcptransport],
   muxers/[muxer, mplex/mplex, mplex/types],
@@ -18,14 +19,15 @@ else:
   import protocols/secure/secio
 
 export
-  switch, peer, peerinfo, connection, multiaddress, crypto
+  switch, peer, peerinfo, connection, multiaddress, crypto, ServerFlags
 
 proc newStandardSwitch*(privKey = none(PrivateKey),
                         address = MultiAddress.init("/ip4/127.0.0.1/tcp/0"),
                         triggerSelf = false,
                         gossip = false,
                         verifySignature = libp2p_pubsub_verify,
-                        sign = libp2p_pubsub_sign): Switch =
+                        sign = libp2p_pubsub_sign,
+                        serverFlags: set[ServerFlags] = {}): Switch =
   proc createMplex(conn: Connection): Muxer =
     result = newMplex(conn)
 
@@ -33,7 +35,7 @@ proc newStandardSwitch*(privKey = none(PrivateKey),
     seckey = privKey.get(otherwise = PrivateKey.random(ECDSA))
     peerInfo = PeerInfo.init(seckey, [address])
     mplexProvider = newMuxerProvider(createMplex, MplexCodec)
-    transports = @[Transport(newTransport(TcpTransport))]
+    transports = @[Transport(newTransport(TcpTransport, serverFlags))]
     muxers = {MplexCodec: mplexProvider}.toTable
     identify = newIdentify(peerInfo)
   when libp2p_secure == "noise":
diff --git a/libp2p/switch.nim b/libp2p/switch.nim
index 182e66b33..de1c67c18 100644
--- a/libp2p/switch.nim
+++ b/libp2p/switch.nim
@@ -22,8 +22,6 @@ import connection,
        errors,
        peer
 
-export ServerFlags
-
 logScope:
   topic = "Switch"
 
@@ -284,7 +282,7 @@ proc mount*[T: LPProtocol](s: Switch, proto: T) {.gcsafe.} =
 
   s.ms.addHandler(proto.codec, proto)
 
-proc start*(s: Switch, serverFlags: set[ServerFlags] = {}): Future[seq[Future[void]]] {.async, gcsafe.} =
+proc start*(s: Switch): Future[seq[Future[void]]] {.async, gcsafe.} =
   trace "starting switch"
 
   proc handle(conn: Connection): Future[void] {.async, closure, gcsafe.} =
@@ -300,7 +298,7 @@ proc start*(s: Switch, serverFlags: set[ServerFlags] = {}): Future[seq[Future[vo
   for t in s.transports: # for each transport
     for i, a in s.peerInfo.addrs:
       if t.handles(a): # check if it handles the multiaddr
-        var server = await t.listen(a, handle, serverFlags)
+        var server = await t.listen(a, handle)
         s.peerInfo.addrs[i] = t.ma # update peer's address
         startFuts.add(server)
 
diff --git a/libp2p/transports/tcptransport.nim b/libp2p/transports/tcptransport.nim
index 4746f2361..7ab51049c 100644
--- a/libp2p/transports/tcptransport.nim
+++ b/libp2p/transports/tcptransport.nim
@@ -16,8 +16,6 @@ import transport,
        ../multicodec,
        ../stream/chronosstream
 
-export ServerFlags
-
 logScope:
   topic = "TcpTransport"
 
@@ -124,13 +122,12 @@ method close*(t: TcpTransport) {.async, gcsafe.} =
 
 method listen*(t: TcpTransport,
                ma: MultiAddress,
-               handler: ConnHandler,
-               serverFlags: set[ServerFlags] = {}):
+               handler: ConnHandler):
                Future[Future[void]] {.async, gcsafe.} =
   discard await procCall Transport(t).listen(ma, handler) # call base
 
   ## listen on the transport
-  t.server = createStreamServer(t.ma, connCb, serverFlags, t)
+  t.server = createStreamServer(t.ma, connCb, t.serverFlags, t)
   t.server.start()
 
   # always get the resolved address in case we're bound to 0.0.0.0:0
diff --git a/libp2p/transports/transport.nim b/libp2p/transports/transport.nim
index ef40839b2..fd703c88e 100644
--- a/libp2p/transports/transport.nim
+++ b/libp2p/transports/transport.nim
@@ -24,13 +24,15 @@ type
     connections*: seq[Connection]
     handler*: ConnHandler
     multicodec*: MultiCodec
+    serverFlags*: set[ServerFlags]
 
 method init*(t: Transport) {.base, gcsafe.} =
   ## perform protocol initialization
   discard
 
-proc newTransport*(t: typedesc[Transport]): t {.gcsafe.} =
+proc newTransport*(t: typedesc[Transport], serverFlags: set[ServerFlags] = {}): t {.gcsafe.} =
   new result
+  result.serverFlags = serverFlags
   result.init()
 
 method close*(t: Transport) {.base, async, gcsafe.} =
@@ -41,8 +43,7 @@ method close*(t: Transport) {.base, async, gcsafe.} =
 
 method listen*(t: Transport,
                ma: MultiAddress,
-               handler: ConnHandler,
-               serverFlags: set[ServerFlags] = {}):
+               handler: ConnHandler):
                Future[Future[void]] {.base, async, gcsafe.} =
   ## listen for incoming connections
   t.ma = ma