diff --git a/app/src/Room.js b/app/src/Room.js
index 0b4fbf96..a506e91c 100644
--- a/app/src/Room.js
+++ b/app/src/Room.js
@@ -974,6 +974,9 @@ module.exports = class Room {
     isLobbyEnabled() {
         return this._isLobbyEnabled || this.globalLobby;
     }
+    isGlobalLobbyEnabled() {
+        return this.globalLobby;
+    }
     isHostOnlyRecording() {
         return this._hostOnlyRecording;
     }
diff --git a/app/src/Server.js b/app/src/Server.js
index bbbb5c97..869adf71 100644
--- a/app/src/Server.js
+++ b/app/src/Server.js
@@ -1923,7 +1923,7 @@ function startServer() {
                 return cb('isLocked');
             }
 
-            if (room.isLobbyEnabled() && !isPresenter) {
+            if ((room.isLobbyEnabled() || room.isGlobalLobbyEnabled()) && !isPresenter) {
                 log.debug(
                     'The user is currently waiting to join the room because the lobby is enabled, and they are not a presenter'
                 );