diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs
index 1cb0066d88..d04d456a78 100644
--- a/Content.Server/Storage/Components/EntityStorageComponent.cs
+++ b/Content.Server/Storage/Components/EntityStorageComponent.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Content.Server.Ghost.Components;
 using Content.Server.Tools.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Acts;
@@ -209,6 +210,10 @@ namespace Content.Server.Storage.Components
                     !entity.HasComponent<SharedBodyComponent>())
                     continue;
 
+                // Let's not insert admin ghosts, yeah? This is really a a hack and should be replaced by attempt events
+                if (entity.HasComponent<GhostComponent>())
+                    continue;
+
                 if (!AddToContents(entity))
                 {
                     continue;
diff --git a/Resources/Changelog/Parts/aghost.yml b/Resources/Changelog/Parts/aghost.yml
new file mode 100644
index 0000000000..dd42c6509f
--- /dev/null
+++ b/Resources/Changelog/Parts/aghost.yml
@@ -0,0 +1,4 @@
+author: Zumorica
+changes:
+  - type: Fix # One of the following: Add, Remove, Tweak, Fix
+    message: Fix being able to trap admin ghosts on lockers.