diff --git a/bigbluebutton-html5/imports/ui/components/logout-confirmation/container.jsx b/bigbluebutton-html5/imports/ui/components/logout-confirmation/container.jsx
index 3865bd746aa5755f08c781d221b3a3f9198beb7b..3dbc153b43a07a10f315dc6b6570bbd1518b1bbf 100644
--- a/bigbluebutton-html5/imports/ui/components/logout-confirmation/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/logout-confirmation/container.jsx
@@ -1,14 +1,20 @@
 import React from 'react';
+import { meetingIsBreakout } from '/imports/ui/components/app/service';
 import { createContainer } from 'meteor/react-meteor-data';
 import LogoutConfirmation from './component';
-import LogoutConfirmationService from './service';
+import {
+  isModerator,
+  endMeeting,
+} from './service';
 
-const LogoutConfirmationContainer = () => (
-  <LogoutConfirmation {...this.props} />
+const LogoutConfirmationContainer = props => (
+  <LogoutConfirmation {...props} />
 );
 
-export default createContainer(() => ({
-  showEndMeeting: !LogoutConfirmationService.isBreakout() &&
-                  LogoutConfirmationService.isModerator(),
-  endMeeting: LogoutConfirmationService.endMeeting,
-}), LogoutConfirmationContainer);
+export default createContainer(() => {
+  return {
+    showEndMeeting: !meetingIsBreakout() &&
+                    isModerator(),
+    handleEndMeeting: endMeeting,
+  }
+}, LogoutConfirmationContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/logout-confirmation/service.js b/bigbluebutton-html5/imports/ui/components/logout-confirmation/service.js
index 966309dd5504daaf1dc997650a60c429a3bddf67..972a8ca9c08130fd39df119559f481455a307998 100644
--- a/bigbluebutton-html5/imports/ui/components/logout-confirmation/service.js
+++ b/bigbluebutton-html5/imports/ui/components/logout-confirmation/service.js
@@ -1,6 +1,5 @@
 import { makeCall } from '/imports/ui/services/api/index';
 import Users from '/imports/api/users';
-import Breakouts from '/imports/api/breakouts';
 import mapUser from '/imports/ui/services/user/mapUser';
 import Auth from '/imports/ui/services/auth';
 
@@ -15,10 +14,7 @@ const isModerator = () => {
   return (currentUser) ? mapUser(currentUser).isModerator : null;
 };
 
-const isBreakout = () => Breakouts.findOne({ breakoutId: Auth.meetingID });
-
-export default {
+export {
   endMeeting,
   isModerator,
-  isBreakout,
 };