diff --git a/Assets/Mirror/Runtime/NetworkClient.cs b/Assets/Mirror/Runtime/NetworkClient.cs
index 85dec7159..51e5fe3f9 100644
--- a/Assets/Mirror/Runtime/NetworkClient.cs
+++ b/Assets/Mirror/Runtime/NetworkClient.cs
@@ -88,8 +88,9 @@ public static class NetworkClient
             new Dictionary<ulong, NetworkIdentity>();
 
         /// <summary>batch messages and send them out in LateUpdate (or after batchInterval)</summary>
-        // (this is pretty much always a good idea)
-        public static bool batching = true;
+        // => always enabled so we can do TickBatching
+        // => can still be disabled internally for tests atm
+        internal static bool batching = true;
 
         static Unbatcher unbatcher = new Unbatcher();
 
diff --git a/Assets/Mirror/Runtime/NetworkManager.cs b/Assets/Mirror/Runtime/NetworkManager.cs
index 384b3fb31..ca21a9e10 100644
--- a/Assets/Mirror/Runtime/NetworkManager.cs
+++ b/Assets/Mirror/Runtime/NetworkManager.cs
@@ -45,10 +45,6 @@ public class NetworkManager : MonoBehaviour
         [Tooltip("Server Update frequency, per second. Use around 60Hz for fast paced games like Counter-Strike to minimize latency. Use around 30Hz for games like WoW to minimize computations. Use around 1-10Hz for slow paced games like EVE.")]
         public int serverTickRate = 30;
 
-        /// <summary>batch messages and send them out in LateUpdate (or after batchInterval)</summary>
-        [Tooltip("Batch message and send them out in LateUpdate (or after batchInterval). This is pretty much always a good idea.")]
-        [FormerlySerializedAs("serverBatching")] public bool batching = true;
-
         /// <summary>Automatically switch to this scene upon going offline (on start / on disconnect / on shutdown).</summary>
         [Header("Scene Management")]
         [Scene]
@@ -246,9 +242,6 @@ void SetupServer()
 
             ConfigureServerFrameRate();
 
-            // batching
-            NetworkServer.batching = batching;
-
             // Copy auto-disconnect settings to NetworkServer
 #pragma warning disable 618
             NetworkServer.disconnectInactiveTimeout = disconnectInactiveTimeout;
@@ -326,9 +319,6 @@ public void StartClient()
 
             mode = NetworkManagerMode.ClientOnly;
 
-            // batching
-            NetworkClient.batching = batching;
-
             InitializeSingleton();
 
             if (runInBackground)
diff --git a/Assets/Mirror/Runtime/NetworkServer.cs b/Assets/Mirror/Runtime/NetworkServer.cs
index c1fb24a35..51d201ea6 100644
--- a/Assets/Mirror/Runtime/NetworkServer.cs
+++ b/Assets/Mirror/Runtime/NetworkServer.cs
@@ -34,8 +34,9 @@ public static class NetworkServer
         public static bool active { get; internal set; }
 
         /// <summary>batch messages and send them out in LateUpdate (or after batchInterval)</summary>
-        // (this is pretty much always a good idea)
-        public static bool batching = true;
+        // => always enabled so we can do TickBatching
+        // => can still be disabled internally for tests atm
+        internal static bool batching = true;
 
         // scene loading
         public static bool isLoadingScene;