diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
index 4a6ac41b12c..966b979fae6 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
@@ -33,7 +33,6 @@ public sealed partial class ChemMasterWindow : FancyWindow
         private const string TransferringAmountColor = "#ffa500";
         private ReagentSortMethod _currentSortMethod = ReagentSortMethod.Alphabetical;
         private ChemMasterBoundUserInterfaceState? _lastState;
-        private string _lastAmountText = "50";
         private int _transferAmount = 50;
 
 
@@ -112,22 +111,6 @@ public ChemMasterWindow()
             SortMethod.AddItem(Loc.GetString("chem-master-window-sort-method-Amount-text"), (int) ReagentSortMethod.Amount);
             SortMethod.AddItem(Loc.GetString("chem-master-window-sort-method-Time-text"), (int) ReagentSortMethod.Time);
             SortMethod.OnItemSelected += HandleChildPressed;
-
-            BufferTransferButton.OnPressed += HandleDiscardTransferPress;
-            BufferDiscardButton.OnPressed += HandleDiscardTransferPress;
-        }
-
-        private void HandleDiscardTransferPress(BaseButton.ButtonEventArgs args)
-        {
-            var buttons = BufferInfo.Children
-                .Where(c => c is Button)
-                .Cast<Button>();
-
-            foreach (var button in buttons)
-            {
-                var text = BufferTransferButton.Pressed ? "transfer" : "discard";
-                button.Text = Loc.GetString($"chem-master-window-{text}-button-text");
-            }
         }
 
         private void HandleSortMethodChange(int newSortMethod)
@@ -163,7 +146,6 @@ private bool ValidateAmount(string newText)
                 return false;
             }
 
-            _lastAmountText = newText;
             _transferAmount = amount;
             OnTransferAmountChanged?.Invoke(amount);
             return true;
@@ -174,10 +156,7 @@ private void SetAmount(LineEdit.LineEditEventArgs args) =>
 
         private void SetAmountText(string newText)
         {
-            if (newText == _lastAmountText)
-                return;
-
-            if (!ValidateAmount(newText))
+            if (newText == _transferAmount.ToString() || !ValidateAmount(newText))
                 return;
 
             var localizedAmount = Loc.GetString(
@@ -208,10 +187,8 @@ private ReagentButton MakeReagentButton(string text, ReagentId id, bool isBuffer
             if (!addReagentButtons)
                 return null; // Return an empty list if reagentTransferButton creation is disabled.
 
-            var text = BufferTransferButton.Pressed ? "transfer" : "discard";
-
             var reagentTransferButton = MakeReagentButton(
-                Loc.GetString($"chem-master-window-{text}-button"),
+                Loc.GetString("chem-master-window-transfer-button"),
                 reagent,
                 isBuffer
             );
@@ -238,15 +215,15 @@ public void UpdateState(BoundUserInterfaceState state)
             SetAmountText(castState.TransferringAmount.ToString());
 
             BufferCurrentVolume.Text = $" {castState.BufferCurrentVolume?.Int() ?? 0}u";
-    
+
             InputEjectButton.Disabled = castState.InputContainerInfo is null;
             OutputEjectButton.Disabled = castState.OutputContainerInfo is null;
             CreateBottleButton.Disabled = castState.OutputContainerInfo?.Reagents == null;
             CreatePillButton.Disabled = castState.OutputContainerInfo?.Entities == null;
-            
+
             UpdateDosageFields(castState);
         }
-        
+
         //assign default values for pill and bottle fields.
         private void UpdateDosageFields(ChemMasterBoundUserInterfaceState castState)
         {
@@ -258,7 +235,7 @@ private void UpdateDosageFields(ChemMasterBoundUserInterfaceState castState)
             var bufferVolume = castState.BufferCurrentVolume?.Int() ?? 0;
 
             PillDosage.Value = (int)Math.Min(bufferVolume, castState.PillDosageLimit);
-            
+
             PillTypeButtons[castState.SelectedPillType].Pressed = true;
             PillNumber.IsValid = x => x >= 0 && x <= pillNumberMax;
             PillDosage.IsValid = x => x > 0 && x <= castState.PillDosageLimit;
@@ -382,7 +359,7 @@ private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
                 }
             }
         }
-        
+
         private void BuildContainerUI(Control control, ContainerInfo? info, bool addReagentButtons)
         {
             control.Children.Clear();
@@ -430,7 +407,7 @@ private void BuildContainerUI(Control control, ContainerInfo? info, bool addReag
                     _prototypeManager.TryIndex(reagent.Reagent.Prototype, out ReagentPrototype? proto);
                     var name = proto?.LocalizedName ?? Loc.GetString("chem-master-window-unknown-reagent-text");
                     var reagentColor = proto?.SubstanceColor ?? default(Color);
-        
+
                     control.Children.Add(BuildReagentRow(reagentColor, rowCount++, name, reagent.Reagent, reagent.Quantity, false, addReagentButtons));
                 }
             }
@@ -491,7 +468,7 @@ private Control BuildReagentRow(Color reagentColor, int rowCount, string name, R
                 Children = { rowContainer }
             };
         }
-        
+
         public string LabelLine
         {
             get => LabelLineEdit.Text;
diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
index 7a960d4b9be..fd5833c036d 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
@@ -75,7 +75,6 @@ private void UpdateUiState(Entity<ChemMasterComponent> ent, bool updateLabel = f
             var bufferCurrentVolume = bufferSolution.Volume;
 
             var state = new ChemMasterBoundUserInterfaceState(
-                chemMaster.Mode,
                 BuildInputContainerInfo(inputContainer),
                 BuildOutputContainerInfo(outputContainer),
                 bufferReagents,
@@ -83,8 +82,8 @@ private void UpdateUiState(Entity<ChemMasterComponent> ent, bool updateLabel = f
                 chemMaster.PillType,
                 chemMaster.PillDosageLimit,
                 updateLabel,
-                chemMaster.SortMethod,
-                chemMaster.TransferringAmount);
+                ent.Comp.SortMethod,
+                ent.Comp.TransferringAmount);
 
             _userInterfaceSystem.SetUiState(owner, ChemMasterUiKey.Key, state);
         }
@@ -102,19 +101,7 @@ private void OnSetPillTypeMessage(Entity<ChemMasterComponent> chemMaster, ref Ch
 
         private void OnReagentButtonMessage(Entity<ChemMasterComponent> chemMaster, ref ChemMasterReagentAmountButtonMessage message)
         {
-            switch (chemMaster.Comp.Mode)
-            {
-                case ChemMasterMode.Transfer:
-                    TransferReagents(chemMaster, message.ReagentId, message.Amount, message.FromBuffer);
-                    break;
-                case ChemMasterMode.Discard:
-                    DiscardReagents(chemMaster, message.ReagentId, message.Amount, message.FromBuffer);
-                    break;
-                default:
-                    // Invalid mode.
-                    return;
-            }
-
+            TransferReagents(chemMaster, message.ReagentId, chemMaster.Comp.TransferringAmount, message.FromBuffer);
             ClickSound(chemMaster);
         }