diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
index 37e4abc5af..d0fd3dc1e7 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
@@ -25,9 +25,9 @@ class ActionsBarContainer extends Component {
 export default withModalMounter(createContainer(({ mountModal }) => {
   const isPresenter = Service.isUserPresenter();
 
-  const handleExitAudio = () => AudioService.handleExitAudio();
+  const handleExitAudio = () => AudioService.exitAudio();
   const handleOpenJoinAudio = () =>
-    mountModal(<AudioModal handleJoinListenOnly={AudioService.handleJoinAudio} />);
+    mountModal(<AudioModal handleJoinListenOnly={AudioService.joinListenOnly} />);
 
   return {
     isUserPresenter: isPresenter,
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-settings/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-settings/component.jsx
index 179a87a59e..8bff98de02 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-settings/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-settings/component.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 import Button from '/imports/ui/components/button/component';
-import { clearModal } from '/imports/ui/components/app/service';
+import { withModalMounter } from '/imports/ui/components/modal/service';
 import styles from '../audio-modal/styles.scss';
 
 import DeviceSelector from '/imports/ui/components/audio/device-selector/component';
@@ -41,7 +41,7 @@ class AudioSettings extends React.Component {
 
   handleClose() {
     this.setState({ isOpen: false });
-    clearModal();
+    this.props.mountModal(null);
   }
 
   render() {
@@ -153,4 +153,4 @@ const intlMessages = defineMessages({
   },
 });
 
-export default injectIntl(AudioSettings);
+export default withModalMounter(injectIntl(AudioSettings));
diff --git a/bigbluebutton-html5/imports/ui/components/audio/enter-audio/container.jsx b/bigbluebutton-html5/imports/ui/components/audio/enter-audio/container.jsx
index 6b3dbdc3df..a0fe3682bd 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/enter-audio/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/enter-audio/container.jsx
@@ -1,10 +1,10 @@
 import React, { Component } from 'react';
 import { createContainer } from 'meteor/react-meteor-data';
-import { joinListenOnly, joinMicrophone } from '../service';
-import { clearModal } from '/imports/ui/components/app/service';
+import AudioService from '../service';
+import { withModalMounter } from '/imports/ui/components/modal/service';
 import EnterAudio from './component';
 
-export default class EnterAudioContainer extends Component {
+class EnterAudioContainer extends Component {
   constructor(props) {
     super(props);
   }
@@ -12,11 +12,12 @@ export default class EnterAudioContainer extends Component {
   render() {
     const {
       isFullAudio,
+      mountModal,
     } = this.props;
 
     let handleJoin = () => {
-      clearModal();
-      return isFullAudio ? joinMicrophone() : joinListenOnly();
+      mountModal(null);
+      return isFullAudio ? AudioService.joinMicrophone() : AudioService.joinListenOnly();
     };
 
     return (
@@ -24,3 +25,5 @@ export default class EnterAudioContainer extends Component {
     );
   }
 }
+
+export default withModalMounter(EnterAudioContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/audio/service.js b/bigbluebutton-html5/imports/ui/components/audio/service.js
index a9796a5f3a..0b2ffb1750 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/service.js
+++ b/bigbluebutton-html5/imports/ui/components/audio/service.js
@@ -32,7 +32,7 @@ let exitAudio = () => audioManager.exitAudio();
 let joinListenOnly = () => audioManager.joinAudio(true);
 let joinMicrophone = () => audioManager.joinAudio(false);
 
-export {
+export default {
   init,
   exitAudio,
   joinListenOnly,
diff --git a/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx b/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx
index a1cc6ed672..686ba6c537 100755
--- a/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
-import { clearModal } from '/imports/ui/components/app/service';
+import { withModalMounter } from '/imports/ui/components/modal/service';
 import { exitAudio } from '../audio/service';
 import Modal from '/imports/ui/components/modal/fullscreen/component';
 
@@ -39,13 +39,16 @@ class BreakoutJoinConfirmation extends Component {
   }
 
   handleJoinBreakoutConfirmation() {
-    const { breakoutURL } = this.props;
+    const {
+      breakoutURL,
+      mountModal,
+    } = this.props;
 
     // leave main room's audio when joining a breakout room
     exitAudio();
 
     window.open(breakoutURL);
-    clearModal();
+    mountModal(null);
   }
 
   render() {
@@ -68,4 +71,4 @@ class BreakoutJoinConfirmation extends Component {
   }
 };
 
-export default injectIntl(BreakoutJoinConfirmation);
+export default withModalMounter(injectIntl(BreakoutJoinConfirmation));
diff --git a/bigbluebutton-html5/imports/ui/components/chat/container.jsx b/bigbluebutton-html5/imports/ui/components/chat/container.jsx
index ded0b3169b..c7a90c46da 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/container.jsx
@@ -41,7 +41,6 @@ class ChatContainer extends Component {
 }
 
 export default injectIntl(createContainer(({ params, intl }) => {
-  console.log('james');
   const chatID = params.chatID || PUBLIC_CHAT_KEY;
 
   let messages = [];