diff --git a/bigbluebutton-html5/imports/ui/components/modal/fullscreen/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/fullscreen/component.jsx
index 12a9000833..ef83479faf 100644
--- a/bigbluebutton-html5/imports/ui/components/modal/fullscreen/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/modal/fullscreen/component.jsx
@@ -49,6 +49,7 @@ const defaultProps = {
     disabled: false,
   },
   dismiss: {
+    callback: () => {},
     disabled: false,
   },
   preventClosing: false,
diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
index b7a01dea46..77ee48d999 100755
--- a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
@@ -37,7 +37,12 @@ class ModalSimple extends Component {
   }
 
   handleDismiss() {
-    this.props.modalHide(this.props.dismiss.callback);
+    const {
+      modalHide,
+      dismiss,
+    } = this.props;
+    if (!dismiss && !modalHide) return;
+    modalHide(dismiss.callback);
   }
 
   render() {