diff --git a/app.js b/app.js
index d979e7767..f1884b66c 100644
--- a/app.js
+++ b/app.js
@@ -69,6 +69,24 @@ function init() {
         return;
     }
 
+    obtainAudioAndVideoPermissions(function (stream) {
+        var audioStream = new webkitMediaStream(stream);
+        var videoStream = new webkitMediaStream(stream);
+        var videoTracks = stream.getVideoTracks();
+        var audioTracks = stream.getAudioTracks();
+        for (var i = 0; i < videoTracks.length; i++) {
+            audioStream.removeTrack(videoTracks[i]);
+        }
+        VideoLayout.changeLocalAudio(audioStream);
+        startLocalRtpStatsCollector(audioStream);
+
+        for (i = 0; i < audioTracks.length; i++) {
+            videoStream.removeTrack(audioTracks[i]);
+        }
+        VideoLayout.changeLocalVideo(videoStream, true);
+        maybeDoJoin();
+    });
+
     var jid = document.getElementById('jid').value || config.hosts.anonymousdomain || config.hosts.domain || window.location.hostname;
     connect(jid);
 }
@@ -100,17 +118,11 @@ function connect(jid, password) {
             if (config.useStunTurn) {
                 connection.jingle.getStunAndTurnCredentials();
             }
-            obtainAudioAndVideoPermissions(function () {
-                getUserMediaWithConstraints(['audio'], audioStreamReady,
-                    function (error) {
-                        console.error('failed to obtain audio stream - stop', error);
-                    });
-            });
-
             document.getElementById('connect').disabled = true;
 
             if(password)
                 authenticatedUser = true;
+            maybeDoJoin();
         } else if (status === Strophe.Status.CONNFAIL) {
             if(msg === 'x-strophe-bad-non-anon-jid') {
                 anonymousConnectionFailed = true;
@@ -146,41 +158,21 @@ function obtainAudioAndVideoPermissions(callback) {
     getUserMediaWithConstraints(
         ['audio', 'video'],
         function (avStream) {
-            avStream.stop();
-            callback();
+            callback(avStream);
         },
         function (error) {
             console.error('failed to obtain audio/video stream - stop', error);
-        });
+        },
+        config.resolution || '360');
 }
 
-function audioStreamReady(stream) {
-
-    VideoLayout.changeLocalAudio(stream);
-
-    startLocalRtpStatsCollector(stream);
-
-    if (RTC.browser !== 'firefox') {
-        getUserMediaWithConstraints(['video'],
-                                    videoStreamReady,
-                                    videoStreamFailed,
-                                    config.resolution || '360');
-    } else {
+function maybeDoJoin() {
+    if (connection && connection.connected && Strophe.getResourceFromJid(connection.jid) // .connected is true while connecting?
+        && (connection.jingle.localAudio || connection.jingle.localVideo)) {
         doJoin();
     }
 }
 
-function videoStreamReady(stream) {
-    VideoLayout.changeLocalVideo(stream, true);
-
-    doJoin();
-}
-
-function videoStreamFailed(error) {
-    console.warn("Failed to obtain video stream - continue anyway", error);
-
-    doJoin();
-}
 
 function doJoin() {
     var roomnode = null;