diff --git a/src/index.js b/src/index.js
index d480a48..8d15fe4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -25,9 +25,11 @@ class Node extends libp2p {
           secio
         ]
       },
-      discovery: [
-        webRTCStar.discovery
-      ]
+      discovery: []
+    }
+
+    if (options.webRTCStar) {
+      modules.discovery.push(webRTCStar.discovery)
     }
 
     if (options.bootstrap && process.env.IPFS_BOOTSTRAP) {
diff --git a/test/webrtc-star-only.js b/test/webrtc-star-only.js
index 7adfd44..d1d56b3 100644
--- a/test/webrtc-star-only.js
+++ b/test/webrtc-star-only.js
@@ -36,8 +36,8 @@ describe('libp2p-ipfs-browser (webrtc only)', () => {
   })
 
   it('create two libp2p nodes with those peers', (done) => {
-    node1 = new Node(peer1)
-    node2 = new Node(peer2)
+    node1 = new Node(peer1, null, { webRTCStar: true })
+    node2 = new Node(peer2, null, { webRTCStar: true })
     done()
   })
 
@@ -122,7 +122,7 @@ describe('libp2p-ipfs-browser (webrtc only)', () => {
       node1.discovery.on('peer', (peerInfo) => node1.dialByPeerInfo(peerInfo, check))
       node2.discovery.on('peer', (peerInfo) => node2.dialByPeerInfo(peerInfo, check))
 
-      const node3 = new Node(peer3)
+      const node3 = new Node(peer3, null, { webRTCStar: true })
       node3.start(check)
     })
   })