diff --git a/client/peer.js b/client/peer.js
index 882877a..28afc70 100644
--- a/client/peer.js
+++ b/client/peer.js
@@ -2,9 +2,17 @@ function errorHandler(error) {
     console.log(error);
 }
 
+
+
 export function createPeer(peerExchange, peerConnectionConfig) {
     const conn = new RTCPeerConnection(peerConnectionConfig);
 
+    conn.addEventListener('icecandidate', event => {
+        if(event.candidate != null) {
+            peerExchange.send({'ice': event.candidate});
+        }
+    });
+
     peerExchange.listen(createPeerExchangeMessageHandler(conn));
 
     return conn;
diff --git a/client/webrtc.js b/client/webrtc.js
index 4091728..6f89bd5 100755
--- a/client/webrtc.js
+++ b/client/webrtc.js
@@ -29,7 +29,6 @@ function getUserMediaSuccess(stream) {
 function setup() {
     peerConnection = createPeer(serverConnection, peerConnectionConfig);
 
-    peerConnection.addEventListener('icecandidate', gotIceCandidate);
     peerConnection.addEventListener('addstream', gotRemoteStream);
 
     if(navigator.mediaDevices.getUserMedia) {
@@ -74,12 +73,6 @@ function extendOffer() {
     peerConnection.createOffer().then(createdDescription).catch(errorHandler);
 }
 
-function gotIceCandidate(event) {
-    if(event.candidate != null) {
-        serverConnection.send({'ice': event.candidate});
-    }
-}
-
 function createdDescription(description) {
     console.log('got description');