diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
index 8b7dfcd2a360df44e4aba30b6aecd5b1d4249c47..29244487c34216f275d69b09489449d75f82dacd 100755
--- a/bigbluebutton-html5/imports/ui/components/app/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -340,7 +340,7 @@ class App extends Component {
 
   render() {
     const {
-      customStyle, customStyleUrl, openPanel,
+      customStyle, customStyleUrl, openPanel, isFullscreen
     } = this.props;
     return (
       <main className={styles.main}>
@@ -359,7 +359,7 @@ class App extends Component {
         </section>
         <UploaderContainer />
         <BreakoutRoomInvitation />
-        <PollingContainer />
+        {!isFullscreen && <PollingContainer />}
         <ModalContainer />
         <AudioContainer />
         <ToastContainer rtl />
diff --git a/bigbluebutton-html5/imports/ui/components/app/container.jsx b/bigbluebutton-html5/imports/ui/components/app/container.jsx
index 6e1bbc806b9ddedd0bfff418d82d7adcb449b21f..5512679045cf15b8fa3ef00d8678e95aaf86179f 100755
--- a/bigbluebutton-html5/imports/ui/components/app/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/container.jsx
@@ -123,6 +123,7 @@ export default injectIntl(withModalMounter(withTracker(({ intl, baseControls })
     startBandwidthMonitoring,
     handleNetworkConnection: () => updateNavigatorConnection(navigator.connection),
     randomlySelectedUser,
+    isFullscreen: Session.get('isFullscreen'),
     currentUserId: currentUser.userId,
   };
 })(AppContainer)));
diff --git a/bigbluebutton-html5/imports/ui/components/fullscreen-button/component.jsx b/bigbluebutton-html5/imports/ui/components/fullscreen-button/component.jsx
index 605c3a7d6733c44f180a0f3af10e3b16cbbd4058..d15960ce48d0280a94b2372c64a371325e974795 100755
--- a/bigbluebutton-html5/imports/ui/components/fullscreen-button/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/fullscreen-button/component.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 import Button from '/imports/ui/components/button/component';
-import PollingContainer from '/imports/ui/components/polling/container';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import { styles } from './styles';
@@ -73,22 +72,18 @@ const FullscreenButtonComponent = ({
   });
 
   return (
-    <>
-      {isFullscreen && <PollingContainer />}
-
-      <div className={wrapperClassName}>
-        <Button
-          color="default"
-          icon={!isFullscreen ? 'fullscreen' : 'exit_fullscreen'}
-          size="sm"
-          onClick={() => handleToggleFullScreen(fullscreenRef)}
-          label={formattedLabel(isFullscreen)}
-          hideLabel
-          className={cx(styles.button, styles.fullScreenButton, className)}
-          data-test="presentationFullscreenButton"
-        />
-      </div>
-    </>
+    <div className={wrapperClassName}>
+      <Button
+        color="default"
+        icon={!isFullscreen ? 'fullscreen' : 'exit_fullscreen'}
+        size="sm"
+        onClick={() => handleToggleFullScreen(fullscreenRef)}
+        label={formattedLabel(isFullscreen)}
+        hideLabel
+        className={cx(styles.button, styles.fullScreenButton, className)}
+        data-test="presentationFullscreenButton"
+      />
+    </div>
   );
 };
 
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
index cd328ab885333112dd76058e2080def031e1446e..21775bbb37d27866eb4032660a188d37aa0db6dc 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
@@ -20,6 +20,7 @@ import FullscreenButtonContainer from '../fullscreen-button/container';
 import { withDraggableConsumer } from '../media/webcam-draggable-overlay/context';
 import Icon from '/imports/ui/components/icon/component';
 import { withLayoutConsumer } from '/imports/ui/components/layout/context';
+import PollingContainer from '/imports/ui/components/polling/container';
 
 const intlMessages = defineMessages({
   presentationLabel: {
@@ -781,6 +782,7 @@ class PresentationArea extends PureComponent {
       showSlide,
       // fitToWidth,
       // presentationAreaWidth,
+      isFullscreen,
       localPosition,
     } = this.state;
 
@@ -819,6 +821,8 @@ class PresentationArea extends PureComponent {
         ref={(ref) => { this.refPresentationContainer = ref; }}
         className={styles.presentationContainer}
       >
+        {isFullscreen && <PollingContainer />}
+        
         <div
           ref={(ref) => { this.refPresentationArea = ref; }}
           className={styles.presentationArea}