diff --git a/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs
index 6a012ba70f..cf7c8c5058 100644
--- a/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs
+++ b/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs
@@ -21,14 +21,14 @@ namespace Content.Client.Administration.UI.ManageSolutions
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
 
-        private readonly EntityUid _targetEntity;
+        private readonly NetEntity _targetEntity;
         private string _targetSolution;
         private ReagentPrototype? _selectedReagent;
 
         // FloatSpinBox does not (yet?) play nice with xaml
         private FloatSpinBox _quantitySpin = new(1, 2) { Value = 10, HorizontalExpand = true};
 
-        public AddReagentWindow(EntityUid targetEntity, string targetSolution)
+        public AddReagentWindow(NetEntity targetEntity, string targetSolution)
         {
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsEui.cs b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsEui.cs
index 2e1b4dcf34..4bee78fa09 100644
--- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsEui.cs
+++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsEui.cs
@@ -12,11 +12,9 @@ namespace Content.Client.Administration.UI.ManageSolutions
     public sealed class EditSolutionsEui : BaseEui
     {
         private readonly EditSolutionsWindow _window;
-        private IEntityManager _entManager;
 
         public EditSolutionsEui()
         {
-            _entManager = IoCManager.Resolve<IEntityManager>();
             _window = new EditSolutionsWindow();
             _window.OnClose += () => SendMessage(new CloseEuiMessage());
         }
@@ -36,7 +34,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
         public override void HandleState(EuiStateBase baseState)
         {
             var state = (EditSolutionsEuiState) baseState;
-            _window.SetTargetEntity(_entManager.GetEntity(state.Target));
+            _window.SetTargetEntity(state.Target);
             _window.UpdateSolutions(state.Solutions);
             _window.UpdateReagents();
         }
diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
index 6c070d3c2e..d2dda0ccbd 100644
--- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
@@ -17,7 +17,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
-        private EntityUid _target = EntityUid.Invalid;
+        private NetEntity _target = NetEntity.Invalid;
         private string? _selectedSolution;
         private AddReagentWindow? _addReagentWindow;
         private Dictionary<string, Solution>? _solutions;
@@ -38,12 +38,13 @@ namespace Content.Client.Administration.UI.ManageSolutions
             _addReagentWindow?.Dispose();
         }
 
-        public void SetTargetEntity(EntityUid target)
+        public void SetTargetEntity(NetEntity target)
         {
             _target = target;
+            var uid = _entityManager.GetEntity(target);
 
-            var targetName = _entityManager.EntityExists(target)
-                ? IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName
+            var targetName = _entityManager.EntityExists(uid)
+                ? _entityManager.GetComponent<MetaDataComponent>(uid).EntityName
                 : string.Empty;
 
             Title = Loc.GetString("admin-solutions-window-title", ("targetName", targetName));