diff --git a/app/src/Server.js b/app/src/Server.js
index ad6e0690..901b90b8 100644
--- a/app/src/Server.js
+++ b/app/src/Server.js
@@ -64,7 +64,7 @@ dev dependencies: {
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.8.23
+ * @version 1.8.24
  *
  */
 
@@ -1641,14 +1641,10 @@ function startServer() {
                 peer_uuid: peer_uuid,
                 is_presenter: is_presenter,
             };
-            // first we check if the username match the presenters username
-            if (hostCfg?.presenters?.list?.includes(peer_name)) {
+            // first we check if the username match the presenters username else if join_first enabled
+            if (hostCfg?.presenters?.list?.includes(peer_name) || (hostCfg?.presenters?.join_first && Object.keys(presenters[socket.room_id]).length === 0)) {
+                presenter.is_presenter = true;
                 presenters[socket.room_id][socket.id] = presenter;
-            } else {
-                // if not match the presenters username, the first one join room is the presenter
-                if (Object.keys(presenters[socket.room_id]).length === 0) {
-                    presenters[socket.room_id][socket.id] = presenter;
-                }
             }
 
             log.info('[Join] - Connected presenters grp by roomId', presenters);
@@ -3286,15 +3282,23 @@ function startServer() {
             }
 
             const isPresenter =
-                // First condition: join_first validation
-                (hostCfg?.presenters?.join_first &&
-                    presenters[room_id]?.[peer_id]?.peer_name === peer_name &&
-                    presenters[room_id]?.[peer_id]?.peer_uuid === peer_uuid &&
-                    Object.keys(presenters[room_id]?.[peer_id] || {}).length > 1) ||
-                // Fallback condition: list check
-                hostCfg?.presenters?.list?.includes(peer_name) ||
-                // Or from presenters list eg. token...
-                presenters[room_id]?.[peer_id]?.is_presenter;
+            // 1. Check if join_first mode is enabled and peer matches presenter criteria:
+            //    - Presenters list contains the peer's room_id and peer_id
+            //    - Peer's name and UUID match the stored values
+            //    - Presenter object has additional properties (length > 1)
+            (hostCfg?.presenters?.join_first &&
+                presenters[room_id]?.[peer_id]?.peer_name === peer_name &&
+                presenters[room_id]?.[peer_id]?.peer_uuid === peer_uuid &&
+                Object.keys(presenters[room_id]?.[peer_id] || {}).length > 1) ||
+            
+            // 2. Check if peer_name exists in the static presenters list configuration
+            hostCfg?.presenters?.list?.includes(peer_name) ||
+            
+            // 3. Check if peer is explicitly marked as presenter (e.g., from token)
+            presenters[room_id]?.[peer_id]?.is_presenter || 
+            
+            // 4. Default case (not a presenter)
+            false;
 
             log.debug('isPeerPresenter Check', {
                 room_id: room_id,
diff --git a/package.json b/package.json
index 7e654715..e45672ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mirotalksfu",
-    "version": "1.8.23",
+    "version": "1.8.24",
     "description": "WebRTC SFU browser-based video calls",
     "main": "Server.js",
     "scripts": {
diff --git a/public/js/Brand.js b/public/js/Brand.js
index 821bc1ca..a1f87d1f 100644
--- a/public/js/Brand.js
+++ b/public/js/Brand.js
@@ -64,7 +64,7 @@ let BRAND = {
     },
     about: {
         imageUrl: '../images/mirotalk-logo.gif',
-        title: '<strong>WebRTC SFU v1.8.23</strong>',
+        title: '<strong>WebRTC SFU v1.8.24</strong>',
         html: `
             <button 
                 id="support-button" 
diff --git a/public/js/Room.js b/public/js/Room.js
index 299e8d05..bf56e449 100644
--- a/public/js/Room.js
+++ b/public/js/Room.js
@@ -11,7 +11,7 @@ if (location.href.substr(0, 5) !== 'https') location.href = 'https' + location.h
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.8.23
+ * @version 1.8.24
  *
  */
 
@@ -5351,7 +5351,7 @@ function showAbout() {
         position: 'center',
         imageUrl: BRAND.about?.imageUrl && BRAND.about.imageUrl.trim() !== '' ? BRAND.about.imageUrl : image.about,
         customClass: { image: 'img-about' },
-        title: BRAND.about?.title && BRAND.about.title.trim() !== '' ? BRAND.about.title : 'WebRTC SFU v1.8.23',
+        title: BRAND.about?.title && BRAND.about.title.trim() !== '' ? BRAND.about.title : 'WebRTC SFU v1.8.24',
         html: `
             <br />
             <div id="about">
diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js
index ccddc124..25c7f788 100644
--- a/public/js/RoomClient.js
+++ b/public/js/RoomClient.js
@@ -9,7 +9,7 @@
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.8.23
+ * @version 1.8.24
  *
  */
 
@@ -1441,7 +1441,7 @@ class RoomClient {
             video: peer_video,
             screen: peer_screen,
             notify: 0,
-            isPresenter: isPresenter,
+            isPresenter: isPresenter || false,
         };
         if (peer_token) queryParams.token = peer_token;
         const url = `${baseUrl}?${Object.entries(queryParams)