diff --git a/plugin/Gallery/view/BigVideoLive.php b/plugin/Gallery/view/BigVideoLive.php
index 4c22c66c93..27b59c2949 100644
--- a/plugin/Gallery/view/BigVideoLive.php
+++ b/plugin/Gallery/view/BigVideoLive.php
@@ -1,21 +1,25 @@
 <?php
 if ($obj->BigVideoLiveForLoggedUsersOnly) {
-    if(!User::isLogged()){
+    if (!User::isLogged()) {
+        echo '<!-- BigVideoLive is disabled for non-logged users -->';
         return '';
     }
 }
 
 if ($obj->BigVideoLive->value == Gallery::BigVideoLiveDisabled) {
+    echo '<!-- BigVideoLive is disabled -->';
     return '';
 }
 
 if ($obj->BigVideoLiveOnFirstPageOnly && (!isFirstPage() || !empty($_GET['catName']) || !empty($_GET['showOnly']) || !empty($_GET['tags_id']))) {
+    echo '<!-- BigVideoLive is disabled on this page -->';
     return '';
 }
 
 if ($obj->BigVideoLive->value == Gallery::BigVideoLiveShowLiveOnly) {
     $liveVideo = Live::getLatest(true);
     if (empty($liveVideo)) {
+        echo '<!-- BigVideoLive is disabled because there is no live video -->';
         return '';
     }
 }
@@ -119,18 +123,18 @@ $urlLiveNow = addQueryStringParameter($urlLiveNow, 'isClosed', 1);
             BigVideoLiveFullscreen(true);
         });
     });
-    
-    window.addEventListener('message', event => {
-            switch (event.data.type) {
-                case 'showBigVideo':
-                    $('#BigVideoLive').slideDown();
-                    break;
-                case 'hideBigVideo':
-                    $('#BigVideoLive').slideUp();
-                    break;
 
-                default:
-                    break;
-            }
-        });
-</script>
\ No newline at end of file
+    window.addEventListener('message', event => {
+        switch (event.data.type) {
+            case 'showBigVideo':
+                $('#BigVideoLive').slideDown();
+                break;
+            case 'hideBigVideo':
+                $('#BigVideoLive').slideUp();
+                break;
+
+            default:
+                break;
+        }
+    });
+</script>
diff --git a/plugin/Gallery/view/mainArea.php b/plugin/Gallery/view/mainArea.php
index d0b6cd999d..99bad1cb9b 100644
--- a/plugin/Gallery/view/mainArea.php
+++ b/plugin/Gallery/view/mainArea.php
@@ -39,6 +39,7 @@ saveRequestVars();
     if (empty($_GET['search']) && !isInfiniteScroll()) {
         $include = AVideoPlugin::getBigVideoIncludeFile();
         if (!empty($include)) {
+            echo '<!-- BigVideoIncludeFile: ' . $include . ' -->';
             include $include;
         } else {
             if ($obj->showLivesAboveBigVideo) {
@@ -46,6 +47,8 @@ saveRequestVars();
             }
             include $global['systemRootPath'] . 'plugin/Gallery/view/BigVideoLive.php';
         }
+    }else{
+        echo '<!-- BigVideoLive is not included because search is enabled -->';
     }
     //var_dump(!empty($video), debug_backtrace());exit;
     if (!empty($video)) {
diff --git a/plugin/Shorts/player.php b/plugin/Shorts/player.php
index cccc1a60fb..ef00b1a995 100644
--- a/plugin/Shorts/player.php
+++ b/plugin/Shorts/player.php
@@ -200,8 +200,8 @@ if ($removeAnimation || !empty($advancedCustom->disableAnimations)) {
             <script>
                 function shareCarouselShorts() {
                     $('.ShortsPlayerOverlay').hide();
-                    if (iframe && iframe[0] && iframe[0].contentWindow) {
-                        iframe[0].contentWindow.postMessage('togglePlayerSocial', '*');
+                    if ($('.ShortsPlayerIframe').length) {
+                        $('.ShortsPlayerIframe')[0].contentWindow.postMessage('togglePlayerSocial', '*');
                     } else {
                         if (typeof togglePlayerSocial === 'function') {
                             togglePlayerSocial();