diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/breakout-room/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/breakout-room/container.jsx
new file mode 100644
index 0000000000..cf97726d8c
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/breakout-room/container.jsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { withTracker } from 'meteor/react-meteor-data';
+import Service from '/imports/ui/components/user-list/service';
+import BreakoutRoomItem from './component';
+import { layoutSelectInput, layoutDispatch } from '../../../layout/context';
+
+const BreakoutRoomContainer = ({ hasBreakoutRoom }) => {
+  const sidebarContent = layoutSelectInput((i) => i.sidebarContent);
+  const { sidebarContentPanel } = sidebarContent;
+  const layoutContextDispatch = layoutDispatch();
+
+  return <BreakoutRoomItem {...{ layoutContextDispatch, sidebarContentPanel, hasBreakoutRoom }} />;
+};
+
+export default withTracker(() => ({
+  hasBreakoutRoom: Service.hasBreakoutRoom(),
+}))(BreakoutRoomContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
index 558bbf7d75..eacfe5abdf 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
@@ -7,7 +7,7 @@ import UserNotesContainer from './user-notes/container';
 import UserCaptionsContainer from './user-captions/container';
 import WaitingUsersContainer from './waiting-users/container';
 import UserPollsContainer from './user-polls/container';
-import BreakoutRoomItem from './breakout-room/component';
+import BreakoutRoomContainer from './breakout-room/container';
 
 const propTypes = {
   currentUser: PropTypes.shape({}).isRequired,
@@ -38,7 +38,7 @@ class UserContent extends PureComponent {
             <WaitingUsersContainer {...{ pendingUsers }} />
           ) : null}
         <UserPollsContainer isPresenter={currentUser.presenter} />
-        <BreakoutRoomItem isPresenter={currentUser.presenter} />
+        <BreakoutRoomContainer />
         <UserParticipantsContainer />
       </Styled.Content>
     );