diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx
index 0ed744a92b..8836c45306 100644
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx
@@ -261,6 +261,8 @@ const WhiteboardContainer = (props) => {
     typeName: 'shape',
   });
 
+  if (!currentPresentationPage) return;
+
   return (
     <Whiteboard
       {...{