diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 3db214fe48..9c7a04b7ea 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -1,7 +1,6 @@
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
-using Content.Client.Options;
 using Content.Client.Eui;
 using Content.Client.Flash;
 using Content.Client.GhostKick;
@@ -21,10 +20,7 @@ using Content.Client.Viewport;
 using Content.Client.Voting;
 using Content.Shared.Administration;
 using Content.Shared.AME;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Dispenser;
 using Content.Shared.Gravity;
-using Content.Shared.Lathe;
 using Content.Shared.Localizations;
 using Content.Shared.Markers;
 using Robust.Client;
@@ -33,10 +29,6 @@ using Robust.Client.Input;
 using Robust.Client.State;
 using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
-#if FULL_RELEASE
-using Robust.Shared;
-using Robust.Shared.Configuration;
-#endif
 using Robust.Shared.ContentPack;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
@@ -73,8 +65,6 @@ namespace Content.Client.Entry
         [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
         [Dependency] private readonly ContentLocalizationManager _contentLoc = default!;
 
-        public const int NetBufferSizeOverride = 2;
-
         public override void Init()
         {
             ClientContentIoC.Register();
@@ -88,11 +78,6 @@ namespace Content.Client.Entry
             IoCManager.BuildGraph();
             IoCManager.InjectDependencies(this);
 
-#if FULL_RELEASE
-            // if FULL_RELEASE, because otherwise this breaks some integration tests.
-            IoCManager.Resolve<IConfigurationManager>().OverrideDefault(CVars.NetBufferSize, NetBufferSizeOverride);
-#endif
-
             _contentLoc.Initialize();
             _componentFactory.DoAutoRegistrations();
             _componentFactory.IgnoreMissingComponents();
diff --git a/Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs b/Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs
index cbe8ebd809..d2cee8d9b3 100644
--- a/Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs
@@ -83,9 +83,7 @@ namespace Content.Client.Options.UI.Tabs
             NetPvsSpawnSlider.Value = CVars.NetPVSEntityBudget.DefaultValue;
             NetPvsEntrySlider.Value = CVars.NetPVSEntityEnterBudget.DefaultValue;
             NetPvsLeaveSlider.Value = CVars.NetPVSEntityExitBudget.DefaultValue;
-
-            // Apparently default value doesn't get updated when using override defaults, so using a const
-            NetInterpRatioSlider.Value = EntryPoint.NetBufferSizeOverride + _stateMan.MinBufferSize;
+            NetInterpRatioSlider.Value = CVars.NetBufferSize.DefaultValue + _stateMan.MinBufferSize;
 
             UpdateChanges();
         }
diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs
index e6bbc5784d..bd0f805ed0 100644
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -16,6 +16,7 @@ using Content.Shared.CCVar;
 using NUnit.Framework;
 using Robust.Client;
 using Robust.Server;
+using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Exceptions;
@@ -237,6 +238,10 @@ public static class PoolManager
         {
             options.CVarOverrides[CCVars.GameMap.Name] = poolSettings.Map;
         }
+
+        // This breaks some tests.
+        // TODO: Figure out which tests this breaks.
+        options.CVarOverrides[CVars.NetBufferSize.Name] = "0";
     }
 
     /// <summary>