diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index 7a0d748106..df0eebb402 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -12,7 +12,8 @@ import { colorPrimary } from '/imports/ui/stylesheets/styled-components/palette'
import { PANELS, ACTIONS, LAYOUT_TYPE } from '../../layout/enums';
import { uniqueId } from '/imports/utils/string-utils';
import { isPresentationEnabled } from '/imports/ui/services/features';
-import {isLayoutsEnabled} from '/imports/ui/services/features';
+import { isLayoutsEnabled } from '/imports/ui/services/features';
+import { disabledFeaturesTimer } from '/imports/ui/services/features';
const propTypes = {
amIPresenter: PropTypes.bool.isRequired,
@@ -239,7 +240,7 @@ class ActionsDropdown extends PureComponent {
})
}
- if (amIModerator && isTimerEnabled) {
+ if (amIModerator && isTimerEnabled && disabledFeaturesTimer()) {
actions.push({
icon: "time",
label: isTimerActive ? intl.formatMessage(intlMessages.deactivateTimerLabel)
diff --git a/bigbluebutton-html5/imports/ui/services/features/index.js b/bigbluebutton-html5/imports/ui/services/features/index.js
index 3b94f064d5..f1471e4344 100644
--- a/bigbluebutton-html5/imports/ui/services/features/index.js
+++ b/bigbluebutton-html5/imports/ui/services/features/index.js
@@ -75,3 +75,7 @@ export function isImportSharedNotesFromBreakoutRoomsEnabled() {
export function isPresentationEnabled() {
return getDisabledFeatures().indexOf('presentation') === -1;
}
+
+export function disabledFeaturesTimer() {
+ return getDisabledFeatures().indexOf('timer') === -1;
+}