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 1a5d64be2b..fe57c84bf8 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
@@ -179,6 +179,9 @@ class ActionsDropdown extends Component {
             description={formatMessage(pollBtnDesc)}
             key={this.pollId}
             onClick={() => {
+              if (Session.equals('hasPollPublished', true)) {
+                Session.set('hidePollResults', true);
+              }
               Session.set('openPanel', 'poll');
               Session.set('forcePollOpen', true);
             }}
@@ -210,7 +213,7 @@ class ActionsDropdown extends Component {
           <DropdownListItem
             icon="video"
             label={!isSharingVideo ? intl.formatMessage(intlMessages.startExternalVideoLabel)
-              : intl.formatMessage(intlMessages.stopExternalVideoLabel) }
+              : intl.formatMessage(intlMessages.stopExternalVideoLabel)}
             description="External Video"
             key="external-video"
             onClick={this.handleExternalVideoClick}
@@ -241,8 +244,9 @@ class ActionsDropdown extends Component {
     ]);
   }
 
-  handleExternalVideoClick = () => {
-    this.props.mountModal(<ExternalVideoModal />);
+  handleExternalVideoClick() {
+    const { mountModal } = this.props;
+    mountModal(<ExternalVideoModal />);
   }
 
   handlePresentationClick() {
diff --git a/bigbluebutton-html5/imports/ui/components/poll/component.jsx b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
index 3703e5176d..c566376d67 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
@@ -109,13 +109,16 @@ class Poll extends Component {
   componentDidUpdate() {
     const { currentUser } = this.props;
 
+    if (Session.get('hidePollResults')) {
+      this.handleBackClick();
+    }
+
     if (!currentUser.presenter) {
       Session.set('openPanel', 'userlist');
       Session.set('forcePollOpen', false);
     }
   }
 
-
   handleInputChange(index, event) {
     // This regex will replace any instance of 2 or more consecutive white spaces
     // with a single white space character.
@@ -126,6 +129,7 @@ class Poll extends Component {
 
   handleBackClick() {
     const { stopPoll } = this.props;
+    Session.set('hidePollResults', false);
 
     stopPoll();
     this.inputEditor = [];
@@ -267,7 +271,7 @@ class Poll extends Component {
     );
   }
 
-  renderNoSlidePanel = () => {
+  renderNoSlidePanel() {
     const { mountModal, intl } = this.props;
     return (
       <div className={styles.noSlidePanelContainer}>
@@ -282,7 +286,7 @@ class Poll extends Component {
     );
   }
 
-  renderPollPanel = () => {
+  renderPollPanel() {
     const { isPolling } = this.state;
     const {
       currentPoll,
diff --git a/bigbluebutton-html5/imports/ui/components/poll/container.jsx b/bigbluebutton-html5/imports/ui/components/poll/container.jsx
index 57fedb27be..4f691b0195 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/poll/container.jsx
@@ -4,8 +4,8 @@ import { withTracker } from 'meteor/react-meteor-data';
 import Auth from '/imports/ui/services/auth';
 import Presentations from '/imports/api/presentations';
 import PresentationAreaService from '/imports/ui/components/presentation/service';
-import Poll from './component';
-import Service from './service';
+import Poll from '/imports/ui/components/poll/component';
+import Service from '/imports/ui/components/poll/service';
 
 const PollContainer = ({ ...props }) => <Poll {...props} />;
 
@@ -32,5 +32,6 @@ export default withTracker(() => {
     publishPoll: Service.publishPoll,
     currentPoll: Service.currentPoll(),
     getUser: Service.getUser,
+    hideResults: Session.get('hidePollResults'),
   };
 })(PollContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx b/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx
index 5e7a35dda1..7eeef493cf 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx
@@ -112,6 +112,7 @@ class LiveResult extends Component {
           ? (
             <Button
               onClick={() => {
+                Session.set('hasPollPublished', true);
                 publishPoll();
                 stopPoll();
               }}