diff --git a/Content.Server/GameObjects/Components/ComputerComponent.cs b/Content.Server/GameObjects/Components/ComputerComponent.cs
index 4a1ce95bc2..8bb647de19 100644
--- a/Content.Server/GameObjects/Components/ComputerComponent.cs
+++ b/Content.Server/GameObjects/Components/ComputerComponent.cs
@@ -21,6 +21,9 @@ namespace Content.Server.GameObjects.Components
         {
             base.Initialize();
 
+            // Let's ensure the container manager and container are here.
+            Owner.EnsureContainer<Container>("board", out var _);
+
             if (Owner.TryGetComponent(out PowerReceiverComponent? powerReceiver) &&
                 Owner.TryGetComponent(out AppearanceComponent? appearance))
             {
@@ -62,7 +65,7 @@ namespace Content.Server.GameObjects.Components
             if (string.IsNullOrEmpty(_boardPrototype))
                 return;
 
-            var container = ContainerHelpers.EnsureContainer<Container>(Owner, "board", out var existed);
+            var container = Owner.EnsureContainer<Container>("board", out var existed);
 
             if (existed)
             {