diff --git a/bigbluebutton-html5/imports/api/users/server/handlers/presenterAssigned.js b/bigbluebutton-html5/imports/api/users/server/handlers/presenterAssigned.js
index 3496b31a441538e1b13174d0d534a22fa88e6dd7..2c36b274a01bef4b04729e60028cf15c78076446 100644
--- a/bigbluebutton-html5/imports/api/users/server/handlers/presenterAssigned.js
+++ b/bigbluebutton-html5/imports/api/users/server/handlers/presenterAssigned.js
@@ -30,6 +30,7 @@ export default function handlePresenterAssigned({ body }, meetingId) {
     };
 
     const defaultPodSelector = {
+      meetingId,
       podId: 'DEFAULT_PRESENTATION_POD',
     };
     const currentDefaultPodPresenter = PresentationPods.findOne(defaultPodSelector);
@@ -39,7 +40,7 @@ export default function handlePresenterAssigned({ body }, meetingId) {
       return setPresenterInPodReqMsg(setPresenterPayload);
     }
 
-    const oldPresenter = Users.findOne({ userId: currentPresenterId, connectionStatus: 'offline' });
+    const oldPresenter = Users.findOne({ meetingId, userId: currentPresenterId, connectionStatus: 'offline' });
 
     if (oldPresenter) {
       return setPresenterInPodReqMsg(setPresenterPayload);