diff --git a/beacon_node/lighthouse_network/src/service/behaviour.rs b/beacon_node/lighthouse_network/src/service/behaviour.rs
index 5a04d6c2d..bd94bb880 100644
--- a/beacon_node/lighthouse_network/src/service/behaviour.rs
+++ b/beacon_node/lighthouse_network/src/service/behaviour.rs
@@ -5,6 +5,7 @@ use crate::types::SnappyTransform;
 
 use crate::gossipsub;
 use libp2p::identify;
+use libp2p::swarm::behaviour::toggle::Toggle;
 use libp2p::swarm::NetworkBehaviour;
 use libp2p::upnp::tokio::Behaviour as Upnp;
 use types::EthSpec;
@@ -34,7 +35,7 @@ where
     /// Provides IP addresses and peer information.
     pub identify: identify::Behaviour,
     /// Libp2p UPnP port mapping.
-    pub upnp: Upnp,
+    pub upnp: Toggle<Upnp>,
     /// The routing pub-sub mechanism for eth2.
     pub gossipsub: Gossipsub,
 }
diff --git a/beacon_node/lighthouse_network/src/service/mod.rs b/beacon_node/lighthouse_network/src/service/mod.rs
index aed9d54ba..c6b85c04e 100644
--- a/beacon_node/lighthouse_network/src/service/mod.rs
+++ b/beacon_node/lighthouse_network/src/service/mod.rs
@@ -29,6 +29,7 @@ use api_types::{PeerRequestId, Request, RequestId, Response};
 use futures::stream::StreamExt;
 use gossipsub_scoring_parameters::{lighthouse_gossip_thresholds, PeerScoreSettings};
 use libp2p::multiaddr::{self, Multiaddr, Protocol as MProtocol};
+use libp2p::swarm::behaviour::toggle::Toggle;
 use libp2p::swarm::{Swarm, SwarmEvent};
 use libp2p::{identify, PeerId, SwarmBuilder};
 use slog::{crit, debug, info, o, trace, warn};
@@ -379,6 +380,11 @@ impl<AppReqId: ReqId, TSpec: EthSpec> Network<AppReqId, TSpec> {
             libp2p::connection_limits::Behaviour::new(limits)
         };
 
+        let upnp = Toggle::from(
+            config
+                .upnp_enabled
+                .then_some(libp2p::upnp::tokio::Behaviour::default()),
+        );
         let behaviour = {
             Behaviour {
                 gossipsub,
@@ -387,7 +393,7 @@ impl<AppReqId: ReqId, TSpec: EthSpec> Network<AppReqId, TSpec> {
                 identify,
                 peer_manager,
                 connection_limits,
-                upnp: Default::default(),
+                upnp,
             }
         };