diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
index 814a8ab4943ed84a1f2ebbd67b8a2b594473612a..ec9a24abf32a4b263011f67b8ec08a5616be99bf 100755
--- a/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
+++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
@@ -18,6 +18,7 @@ import clearPresentationPods from '/imports/api/presentation-pods/server/modifie
 import clearVoiceUsers from '/imports/api/voice-users/server/modifiers/clearVoiceUsers';
 import clearUserInfo from '/imports/api/users-infos/server/modifiers/clearUserInfo';
 import clearConnectionStatus from '/imports/api/connection-status/server/modifiers/clearConnectionStatus';
+import clearScreenshare from '/imports/api/screenshare/server/modifiers/clearScreenshare';
 import clearNote from '/imports/api/note/server/modifiers/clearNote';
 import clearNetworkInformation from '/imports/api/network-information/server/modifiers/clearNetworkInformation';
 import clearMeetingTimeRemaining from '/imports/api/meetings/server/modifiers/clearMeetingTimeRemaining';
@@ -56,6 +57,7 @@ export default function meetingHasEnded(meetingId) {
     clearVideoStreams(meetingId);
     clearAuthTokenValidation(meetingId);
     clearWhiteboardMultiUser(meetingId);
+    clearScreenshare(meetingId);
     BannedUsers.delete(meetingId);
     Metrics.removeMeeting(meetingId);
 
diff --git a/bigbluebutton-html5/imports/api/screenshare/server/modifiers/clearScreenshare.js b/bigbluebutton-html5/imports/api/screenshare/server/modifiers/clearScreenshare.js
index 06797304812187738cba48fc0278ec96fe721139..2f365d99ed51d5fb45df60a72405f138293bbdce 100644
--- a/bigbluebutton-html5/imports/api/screenshare/server/modifiers/clearScreenshare.js
+++ b/bigbluebutton-html5/imports/api/screenshare/server/modifiers/clearScreenshare.js
@@ -7,6 +7,8 @@ export default function clearScreenshare(meetingId, screenshareConf) {
 
     if (meetingId && screenshareConf) {
       numberAffected = Screenshare.remove({ meetingId, 'screenshare.screenshareConf': screenshareConf });
+    } else if (meetingId) {
+      numberAffected = Screenshare.remove({ meetingId });
     } else {
       numberAffected = Screenshare.remove({});
     }