diff --git a/bigbluebutton-html5/imports/ui/components/breakout-room/invitation/component.jsx b/bigbluebutton-html5/imports/ui/components/breakout-room/invitation/component.jsx
index 2c5b64ccb8..aed1daa7aa 100644
--- a/bigbluebutton-html5/imports/ui/components/breakout-room/invitation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/breakout-room/invitation/component.jsx
@@ -10,7 +10,7 @@ const BREAKOUT_MODAL_DELAY = 200;
 const propTypes = {
   mountModal: PropTypes.func.isRequired,
   lastBreakoutReceived: PropTypes.shape({
-    breakoutUrlData: PropTypes.func.isRequired,
+    breakoutUrlData: PropTypes.object.isRequired,
   }),
   breakoutRoomsUserIsIn: PropTypes.shape({
     sequence: PropTypes.number.isRequired,
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
index 4874329d81..dec40b6c10 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
@@ -1,5 +1,5 @@
+import React from 'react';
 import { withTracker } from 'meteor/react-meteor-data';
-import PropTypes from 'prop-types';
 import Auth from '/imports/ui/services/auth';
 import Meetings from '/imports/api/meetings';
 import ActionsBarService from '/imports/ui/components/actions-bar/service';
@@ -12,12 +12,6 @@ import { notify } from '/imports/ui/services/notification';
 import UserOptions from './component';
 import { layoutSelect } from '/imports/ui/components/layout/context';
 
-const propTypes = {
-  users: PropTypes.arrayOf(Object).isRequired,
-  clearAllEmojiStatus: PropTypes.func.isRequired,
-  intl: PropTypes.object.isRequired,
-};
-
 const intlMessages = defineMessages({
   clearStatusMessage: {
     id: 'app.userList.content.participants.options.clearedStatus',
@@ -32,14 +26,26 @@ const meetingMuteDisabledLog = () => logger.info({
   extraInfo: { logType: 'moderator_action' },
 }, 'moderator disabled meeting mute');
 
-const UserOptionsContainer = withTracker((props) => {
+const UserOptionsContainer = (props) => {
+  const isRTL = layoutSelect((i) => i.isRTL);
+  return ( 
+    <UserOptions
+      {...props}
+      {...{
+        isRTL
+      }}
+    />
+  )
+};
+
+export default injectIntl(withTracker((props) => {
   const {
     users,
     clearAllEmojiStatus,
     intl,
     isMeetingMuteOnStart,
   } = props;
-  
+
   const toggleStatus = () => {
     clearAllEmojiStatus(users);
 
@@ -54,10 +60,8 @@ const UserOptionsContainer = withTracker((props) => {
     const { name } = meetingProp;
     return name;
   };
-
-  const isRTL = layoutSelect((i) => i.isRTL);
-
   return {
+    ...props,
     toggleMuteAllUsers: () => {
       UserListService.muteAllUsers(Auth.userID);
       if (isMeetingMuteOnStart) {
@@ -88,10 +92,5 @@ const UserOptionsContainer = withTracker((props) => {
     meetingName: getMeetingName(),
     openLearningDashboardUrl: LearningDashboardService.openLearningDashboardUrl,
     dynamicGuestPolicy,
-    isRTL,
   };
-})(UserOptions);
-
-UserOptionsContainer.propTypes = propTypes;
-
-export default injectIntl(UserOptionsContainer);
+})(UserOptionsContainer));