diff --git a/src/components/layouts/Conference.vue b/src/components/layouts/Conference.vue
index 424d6301..37db24bc 100644
--- a/src/components/layouts/Conference.vue
+++ b/src/components/layouts/Conference.vue
@@ -188,8 +188,9 @@
                     this.$store.dispatch('conference/toggleScreen');
                 }
             },
-            join(conferenceId) {
+            async join(conferenceId) {
                 if(this.hasConferenceId) {
+                    await this.$store.dispatch('conference/enableMicrophone');
                     this.$store.dispatch('conference/join', conferenceId);
                 }
             },
diff --git a/src/components/pages/Conference/CscConferenceJoin.vue b/src/components/pages/Conference/CscConferenceJoin.vue
index 6e0452d5..ba9c0a43 100644
--- a/src/components/pages/Conference/CscConferenceJoin.vue
+++ b/src/components/pages/Conference/CscConferenceJoin.vue
@@ -31,7 +31,7 @@
             <q-btn
                 class="csc-button"
                 :color="joinButtonColor"
-                :disable="!(isMediaEnabled && hasConferenceId) || isJoining"
+                :disable="!hasConferenceId || isJoining"
                 icon="call"
                 round
                 @click="join"
@@ -92,12 +92,7 @@
                 return classes;
             },
             joinButtonColor() {
-                if(this.isMediaEnabled && this.hasConferenceId) {
-                    return 'primary';
-                }
-                else {
-                    return 'grey';
-                }
+                return 'primary';
             },
             shareButtonColor() {
                 if(this.hasConferenceId) {
diff --git a/src/store/conference.js b/src/store/conference.js
index 5e11d46f..c6ce2768 100644
--- a/src/store/conference.js
+++ b/src/store/conference.js
@@ -187,7 +187,7 @@ export default {
                     break;
             }
             let localMediaStream;
-            media.build().then(($localMediaStream)=>{
+            return media.build().then(($localMediaStream)=>{
                 localMediaStream = $localMediaStream;
                 localMediaStream.onVideoEnded(()=>{
                     context.dispatch('createLocalMedia', MediaTypes.mic);
@@ -237,7 +237,7 @@ export default {
                 }
             });
         },
-        enableMicrophone(context) {
+        async enableMicrophone(context) {
             if(!context.getters.isLocalMediaRequesting) {
                 let mediaType = MediaTypes.mic;
                 if(context.getters.isCameraEnabled) {
@@ -246,7 +246,7 @@ export default {
                 else if(context.getters.isScreenEnabled) {
                     mediaType = MediaTypes.micScreen;
                 }
-                context.dispatch('createLocalMedia', mediaType);
+                await context.dispatch('createLocalMedia', mediaType);
             }
         },
         disableMicrophone(context) {