diff --git a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx
index 06955b844becd4205cfc75a70636b1207626e277..72bb68bf940da7fa6f51c52ac01b360be0c79d1f 100644
--- a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx
@@ -12,6 +12,10 @@ const intlMessages = defineMessages({
   },
   endMeetingDescription: {
     id: 'app.endMeeting.description',
+    description: 'end meeting description with affected users information',
+  },
+  endMeetingNoUserDescription: {
+    id: 'app.endMeeting.noUserDescription',
     description: 'end meeting description',
   },
   yesLabel: {
@@ -50,7 +54,10 @@ class EndMeetingComponent extends React.PureComponent {
       >
         <div className={styles.container}>
           <div className={styles.description}>
-            {intl.formatMessage(intlMessages.endMeetingDescription, { 0: users })}
+            {users > 0
+              ? intl.formatMessage(intlMessages.endMeetingDescription, { 0: users })
+              : intl.formatMessage(intlMessages.endMeetingNoUserDescription)
+            }
           </div>
           <div className={styles.footer}>
             <Button
diff --git a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/service.js b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/service.js
index 7e6479b036497b7ce09f2d571fa6c22c180114ed..5817cdab2cdb8e5e0c8c5408186044f85d18a431 100644
--- a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/service.js
+++ b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/service.js
@@ -13,6 +13,7 @@ const getMeetingTitle = () => {
 const getUsers = () => {
   const numUsers = Users.find({
     meetingId: Auth.meetingID,
+    userId: { $ne: Auth.userID },
   }, { fields: { _id: 1 } }).count();
 
   return numUsers;
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 69b7b70442ac74643ae916daacf4401ea37f6864..4e0dc1eb559e36a5ab0ea45eb4bf66c17819a9b4 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -303,6 +303,7 @@
     "app.leaveConfirmation.confirmDesc": "Logs you out of the meeting",
     "app.endMeeting.title": "End {0}",
     "app.endMeeting.description": "This action will end the session for {0} active user(s). Are you sure you want to end this session?",
+    "app.endMeeting.noUserDescription": "Are you sure you want to end this session?",
     "app.endMeeting.yesLabel": "Yes",
     "app.endMeeting.noLabel": "No",
     "app.about.title": "About",