diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
index 33631c8c0aacf782abd9cb5a33fb415bbf6f57f0..a3986b2452d41ff6bc00411c659314d6498b5ac3 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
@@ -122,7 +122,7 @@ class BigBlueButtonActor(val system: ActorSystem,
         meetings -= msg.meetingID
         log.info("Kick everyone out on meetingId={}", msg.meetingID)
         if (m.mProps.isBreakout) {
-          log.info("Informing parent meeting {} that a breakout room has been ended{}", m.mProps.externalMeetingID, m.mProps.meetingID)
+          log.info("Informing parent meeting {} that a breakout room has been ended {}", m.mProps.externalMeetingID, m.mProps.meetingID)
           eventBus.publish(BigBlueButtonEvent(m.mProps.externalMeetingID,
             BreakoutRoomEnded(m.mProps.externalMeetingID, m.mProps.meetingID)))
         }
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
index e05a2c96eb71ca91866e7cd344ff8341f21c5e94..c99b5edf5f7bee0ee5ca51a008f5edc7f6e6f5de 100755
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -1492,7 +1492,7 @@ class ApiController {
         reject = true;
       else {
         us = meetingService.getUserSession(sessionToken);
-        meeting = meetingService.getMeeting(us.meetingID, true);
+        meeting = meetingService.getMeeting(us.meetingID);
         if (meeting == null || meeting.isForciblyEnded()) {
           reject = true
         }
diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
index de0a959ce1b8b84edc63aec06cab87e25d66bf4d..6ef36bd644899d3cf3b1e1a3084ca528d832ff47 100755
--- a/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
+++ b/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
@@ -352,16 +352,15 @@ public class MeetingService implements MessageListener {
     }
 
     public Meeting getMeeting(String meetingId) {
-        return getMeeting(meetingId, false);
-    }
-
-    public Meeting getMeeting(String meetingId, Boolean exactMatch) {
         if (meetingId == null)
             return null;
+        int dashes = meetingId.split("-", -1).length - 1;
         for (String key : meetings.keySet()) {
-            if ((!exactMatch && key.startsWith(meetingId))
-                    || (exactMatch && key.equals(meetingId)))
+            int keyDashes = key.split("-", -1).length - 1;
+            if (dashes == 2 && key.equals(meetingId)
+                    || (dashes < 2 && keyDashes < 2 && key.startsWith(meetingId))) {
                 return (Meeting) meetings.get(key);
+            }
         }
 
         return null;