diff --git a/front/src/WebRtc/SimplePeer.ts b/front/src/WebRtc/SimplePeer.ts
index 7ada04aa..d9e72ad2 100644
--- a/front/src/WebRtc/SimplePeer.ts
+++ b/front/src/WebRtc/SimplePeer.ts
@@ -231,23 +231,13 @@ export class SimplePeer {
         try {
             let localStream: MediaStream | null = this.MediaManager.localStream;
             let localScreenCapture: MediaStream | null = this.MediaManager.localScreenCapture;
-            let PeerConnection : any = this.PeerConnectionArray.get(userId);
-            if (PeerConnection === undefined) {
+            let PeerConnection = this.PeerConnectionArray.get(userId);
+
+            if (!PeerConnection || PeerConnection === undefined) {
                 throw new Error('While adding media, cannot find user with ID ' + userId);
             }
             PeerConnection.write(new Buffer(JSON.stringify(Object.assign(this.MediaManager.constraintsMedia, {screen: localScreenCapture !== null}))));
 
-            //remove current stream
-            try {
-                if (PeerConnection._pc) {
-                    PeerConnection._pc.getRemoteStreams().forEach((stream: MediaStream) => {
-                        stream.getTracks().forEach((track: MediaStreamTrack) => {
-                            PeerConnection.removeTrack(track, stream);
-                        });
-                    });
-                }
-            }catch (e) {}
-
             if (localScreenCapture !== null) {
                 for (const track of localScreenCapture.getTracks()) {
                     PeerConnection.addTrack(track, localScreenCapture);