diff --git a/frontend/app/components/Session_/WarnBadge.tsx b/frontend/app/components/Session_/WarnBadge.tsx
index a75459485..90ac23076 100644
--- a/frontend/app/components/Session_/WarnBadge.tsx
+++ b/frontend/app/components/Session_/WarnBadge.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { Alert } from 'antd';
 import { Icon } from 'UI';
 import { useTranslation } from 'react-i18next';
-import { VIRTUAL_MODE_KEY } from '@/player/web/MessageManager';
 
 const localhostWarn = (project: string) => `${project}_localhost_warn`;
 
@@ -48,19 +47,21 @@ const WarnBadge = React.memo(
     const localhostWarnSiteKey = localhostWarn(siteId);
     const defaultLocalhostWarn =
       localStorage.getItem(localhostWarnSiteKey) !== '1';
-    const localhostWarnActive =
+    const localhostWarnActive = Boolean(
       currentLocation &&
       defaultLocalhostWarn &&
-      /(localhost)|(127.0.0.1)|(0.0.0.0)/.test(currentLocation);
+      /(localhost)|(127.0.0.1)|(0.0.0.0)/.test(currentLocation)
+    )
     const trackerVersion = window.env.TRACKER_VERSION ?? undefined;
     const trackerVerDiff = compareVersions(version, trackerVersion);
     const trackerWarnActive = trackerVerDiff !== VersionComparison.Same;
 
-    const [warnings, setWarnings] = React.useState([localhostWarnActive, trackerWarnActive, virtualElsFailed])
+    const [warnings, setWarnings] = React.useState<[localhostWarn: boolean, trackerWarn: boolean, virtualElsFailWarn: boolean]>([localhostWarnActive, trackerWarnActive, virtualElsFailed])
 
     React.useEffect(() => {
       setWarnings([localhostWarnActive, trackerWarnActive, virtualElsFailed])
     }, [localhostWarnActive, trackerWarnActive, virtualElsFailed])
+
     const closeWarning = (type: 0 | 1 | 2) => {
       if (type === 1) {
         localStorage.setItem(localhostWarnSiteKey, '1');
@@ -72,11 +73,6 @@ const WarnBadge = React.memo(
       });
     };
 
-    const switchVirtualMode = () => {
-
-    }
-
-    console.log(warnings)
     if (!warnings.some(el => el === true)) return null;
 
     return (
@@ -154,7 +150,7 @@ const WarnBadge = React.memo(
 
             <div
               className="py-1 ml-3 cursor-pointer"
-              onClick={switchVirtualMode}
+              onClick={() => closeWarning(2)}
             >
               <Icon name="close" size={16} color="black" />
             </div>
diff --git a/frontend/app/player/web/TabManager.ts b/frontend/app/player/web/TabManager.ts
index d30f954de..71dd9ed53 100644
--- a/frontend/app/player/web/TabManager.ts
+++ b/frontend/app/player/web/TabManager.ts
@@ -118,9 +118,12 @@ export default class TabSessionManager {
       this.session.isMobile,
       this.setCSSLoading,
       () => {
-        this.state.update({
-          vModeBadge: true,
-        })
+        setTimeout(() => {
+          this.state.update({
+            vModeBadge: true,
+          })
+          // easier to spot the warning appearing plus more time to go over all messages
+        }, 1000)
       }
     );
     this.lists = new Lists(initialLists);
@@ -132,9 +135,7 @@ export default class TabSessionManager {
     });
   }
 
-  private virtualMode = false;
   public setVirtualMode = (virtualMode: boolean) => {
-    this.virtualMode = virtualMode;
     this.pagesManager.setVirtualMode(virtualMode);
   };
 
diff --git a/frontend/app/player/web/managers/DOM/DOMManager.ts b/frontend/app/player/web/managers/DOM/DOMManager.ts
index 67c3415d0..b518395b0 100644
--- a/frontend/app/player/web/managers/DOM/DOMManager.ts
+++ b/frontend/app/player/web/managers/DOM/DOMManager.ts
@@ -70,7 +70,6 @@ export default class DOMManager extends ListWalker<Message> {
   };
   public readonly time: number;
   private virtualMode: boolean = false;
-  private hasCustomElements = false;
   private showVModeBadge?: () => void;
 
   constructor(params: {
@@ -443,16 +442,16 @@ export default class DOMManager extends ListWalker<Message> {
         // shadow DOM for a custom element + SALESFORCE (<slot>)
         const isCustomElement =
           vElem.tagName.includes('-') || vElem.tagName === 'SLOT';
+        const hasSlots = vElem.tagName === 'SLOT';
 
         if (isCustomElement) {
-          this.hasCustomElements = true;
           if (this.virtualMode) {
             // Store the mapping but don't create the actual shadow root
             this.shadowRootParentMap.set(msg.id, msg.frameID);
-          } else {
+            return;
+          } else if (hasSlots) {
             this.showVModeBadge?.();
           }
-          return;
         }
 
         // Real iframes