diff --git a/CefService.cs b/CefService.cs
index 300cfbb7..c6b1a0d6 100644
--- a/CefService.cs
+++ b/CefService.cs
@@ -44,7 +44,7 @@ namespace VRCX
             cefSettings.CefCommandLineArgs.Add("disable-web-security");
             cefSettings.SetOffScreenRenderingBestPerformanceArgs();
 
-            CefSharpSettings.WcfEnabled = true; // TOOD: REMOVE THIS LINE YO
+            // CefSharpSettings.WcfEnabled = true; // TOOD: REMOVE THIS LINE YO
             CefSharpSettings.ShutdownOnExit = false;
 
             // Enable High-DPI support on Windows 7 or newer
diff --git a/html/src/app.js b/html/src/app.js
index 04e1524f..4f091136 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -13384,8 +13384,7 @@ speechSynthesis.getVoices();
                     if (typeof ref !== 'undefined') {
                         if (
                             !ref.isFriend ||
-                            ref.status === 'ask me' ||
-                            ref.status === 'busy'
+                            ref.location !== this.lastLocation.location
                         ) {
                             // fix $location_at
                             var {joinTime} = this.lastLocation.playerList.get(