diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx
index 5b331f3636b0e0bdb1b569365424371b3e456ee7..671a425a9b126d61c08fe4b032417aae0930caaa 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx
@@ -295,6 +295,10 @@ class PresentationUploader extends Component {
     }
   }
 
+  componentWillUnmount() {
+    Session.set('showUploadPresentationView', false);
+  }
+
   isDefault(presentation) {
     const { defaultFileName } = this.props;
     return presentation.filename === defaultFileName
@@ -312,8 +316,8 @@ class PresentationUploader extends Component {
     const validExtentions = fileValidMimeTypes.map((fileValid) => fileValid.extension);
     const [accepted, rejected] = _.partition(files
       .concat(files2), (f) => (
-      validMimes.includes(f.type) || validExtentions.includes(`.${f.name.split('.').pop()}`)
-    ));
+        validMimes.includes(f.type) || validExtentions.includes(`.${f.name.split('.').pop()}`)
+      ));
 
     const presentationsToUpload = accepted.map((file) => {
       const id = _.uniqueId(file.name);
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/container.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/container.jsx
index 0fac2c8ad5370b60353317d132b7b2dfe7a84414..b8d4421f5d9a6739895700958e9bfea87a84e284 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/container.jsx
@@ -12,9 +12,9 @@ const PRESENTATION_CONFIG = Meteor.settings.public.presentation;
 const PresentationUploaderContainer = (props) => (
   props.isPresenter
   && (
-  <ErrorBoundary Fallback={() => <FallbackModal />}>
-    <PresentationUploader {...props} />
-  </ErrorBoundary>
+    <ErrorBoundary Fallback={() => <FallbackModal />}>
+      <PresentationUploader {...props} />
+    </ErrorBoundary>
   )
 );
 
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/service.js b/bigbluebutton-html5/imports/ui/components/presentation/service.js
index bf3ee758660ef5f9dbc428e99454b84e900317b1..5c82cda4af521a2ff2aabbd91d7157b3f6d3e6fa 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/service.js
+++ b/bigbluebutton-html5/imports/ui/components/presentation/service.js
@@ -155,17 +155,12 @@ const parseCurrentSlideContent = (yesValue, noValue, abstentionValue, trueValue,
 };
 
 const isPresenter = (podId) => {
-  // a main presenter in the meeting always owns a default pod
-  if (podId !== 'DEFAULT_PRESENTATION_POD') {
-    // if a pod is not default, then we check whether this user owns a current pod
-    const selector = {
-      meetingId: Auth.meetingID,
-      podId,
-    };
-    const pod = PresentationPods.findOne(selector);
-    return pod.currentPresenterId === Auth.userID;
-  }
-  return true;
+  const selector = {
+    meetingId: Auth.meetingID,
+    podId,
+  };
+  const pod = PresentationPods.findOne(selector);
+  return pod?.currentPresenterId === Auth.userID;
 };
 
 export default {