diff --git a/Assets/PlayroomKit/PlayroomKit.cs b/Assets/PlayroomKit/PlayroomKit.cs
index c9528df..4dd5d98 100644
--- a/Assets/PlayroomKit/PlayroomKit.cs
+++ b/Assets/PlayroomKit/PlayroomKit.cs
@@ -95,8 +95,10 @@ public Player GetPlayer(string playerId)
                     }
                     else if (CurrentMockMode == MockModeSelector.Browser)
                     {
+#if UNITY_EDITOR
                         player = new Player(playerId,
                             new BrowserMockPlayerService(UnityBrowserBridge.Instance, playerId));
+#endif
                     }
                 }
                 else
@@ -115,28 +117,26 @@ public static Player GetPlayerById(string playerId)
             {
                 return player;
             }
-            else
-            {
-                if (!IsRunningInBrowser())
-                {
-                    if (CurrentMockMode == MockModeSelector.Local)
-                    {
-                        player = new Player(playerId, new Player.LocalPlayerService(playerId));
-                    }
-                    else if (CurrentMockMode == MockModeSelector.Browser)
-                    {
-                        player = new Player(playerId,
-                            new BrowserMockPlayerService(UnityBrowserBridge.Instance, playerId));
-                    }
-                }
-                else
-                {
-                    player = new Player(playerId, new Player.PlayerService(playerId));
-                }
 
-                Players.Add(playerId, player);
-                return player;
+#if UNITY_WEBGL
+            player = new Player(playerId, new Player.PlayerService(playerId));
+
+            Players.Add(playerId, player);
+            return player;
+#elif UNITY_EDITOR
+            if (CurrentMockMode == MockModeSelector.Local)
+            {
+                player = new Player(playerId, new Player.LocalPlayerService(playerId));
             }
+            else if (CurrentMockMode == MockModeSelector.Browser)
+            {
+                player = new Player(playerId,
+                    new BrowserMockPlayerService(UnityBrowserBridge.Instance, playerId));
+            }
+
+            Players.Add(playerId, player);
+            return player;
+#endif
         }
 
         public void SetState<T>(string key, T value, bool reliable = false)
@@ -255,7 +255,6 @@ public void ResetStates(string[] keysToExclude = null, Action OnStatesReset = nu
         public void ResetPlayersStates(string[] keysToExclude = null, Action OnStatesReset = null)
         {
             _playroomService.ResetPlayersStates(keysToExclude, OnStatesReset);
-            
         }
 
         // Joystick
diff --git a/Assets/PlayroomKit/modules/MockMode/BrowserMode/BrowserMockPlayerService.cs b/Assets/PlayroomKit/modules/MockMode/BrowserMode/BrowserMockPlayerService.cs
index c37e187..b386afe 100644
--- a/Assets/PlayroomKit/modules/MockMode/BrowserMode/BrowserMockPlayerService.cs
+++ b/Assets/PlayroomKit/modules/MockMode/BrowserMode/BrowserMockPlayerService.cs
@@ -4,6 +4,8 @@
 
 namespace Playroom
 {
+#if UNITY_EDITOR
+
     public class BrowserMockPlayerService : PlayroomKit.Player.IPlayerBase
     {
         private readonly UnityBrowserBridge _ubb;
@@ -116,7 +118,7 @@ public void WaitForState(string stateKey, Action<string> onStateSetCallback = nu
             MockCallbackInvoker invoker = callbackObject.AddComponent<MockCallbackInvoker>();
             invoker.SetCallback(onStateSetCallback, callbackKey);
             CallBacksHandlerMock.Instance.RegisterCallbackObject(callbackKey, callbackObject, "ExecuteCallback");
-            
+
             _ubb.CallJs("WaitForPlayerState", null, null, true, _id, stateKey, callbackKey);
         }
 
@@ -132,4 +134,5 @@ private class PrimitiveWrapper<T>
 
         #endregion
     }
+#endif
 }
\ No newline at end of file
diff --git a/Assets/PlayroomKit/modules/MockMode/BrowserMode/BrowserMockService.cs b/Assets/PlayroomKit/modules/MockMode/BrowserMode/BrowserMockService.cs
index 65b2dee..7857a9a 100644
--- a/Assets/PlayroomKit/modules/MockMode/BrowserMode/BrowserMockService.cs
+++ b/Assets/PlayroomKit/modules/MockMode/BrowserMode/BrowserMockService.cs
@@ -2,7 +2,10 @@
 using System.Reflection;
 using UBB;
 using UnityEngine;
+
+#if UNITY_EDITOR
 using ParrelSync;
+#endif
 
 namespace Playroom
 {
@@ -22,6 +25,7 @@ public void InsertCoin(InitOptions options = null, Action onLaunchCallBack = nul
             {
                 _ubb.httpServerPort += 10;
             }
+
             _ubb.StartUBB();
 
             string optionsJson = null;
@@ -189,7 +193,5 @@ public static void MockOnPlayerJoinWrapper(string playerId)
 
         #endregion
     }
-
-
 #endif
 }
\ No newline at end of file
diff --git a/Assets/PlayroomKit/modules/MockMode/BrowserMode/PlayroomMockBrowserBridge.js b/Assets/PlayroomKit/modules/MockMode/BrowserMode/PlayroomMockBrowserBridge.js
index 54fdd81..d9a9ce5 100644
--- a/Assets/PlayroomKit/modules/MockMode/BrowserMode/PlayroomMockBrowserBridge.js
+++ b/Assets/PlayroomKit/modules/MockMode/BrowserMode/PlayroomMockBrowserBridge.js
@@ -277,4 +277,4 @@ RpcCall = function (name, data, rpcMode) {
   }
 
   Playroom.RPC.call(name, data, mode);
-};
+};
\ No newline at end of file