diff --git a/Content.Server/Administration/Commands/AGhost.cs b/Content.Server/Administration/Commands/AGhost.cs
index 9ec7adab07..4454f79872 100644
--- a/Content.Server/Administration/Commands/AGhost.cs
+++ b/Content.Server/Administration/Commands/AGhost.cs
@@ -33,32 +33,29 @@ namespace Content.Server.Administration.Commands
                 return;
             }
 
-            if (mind.VisitingEntity != null && mind.VisitingEntity.Prototype?.ID == "AdminObserver")
+            if (mind.VisitingEntity != null && mind.VisitingEntity.HasComponent<GhostComponent>())
             {
-                var visiting = mind.VisitingEntity;
-                mind.UnVisit();
-                visiting.Delete();
+                shell.WriteLine("Aren't you a ghost already?");
+                return;
+            }
+
+            var canReturn = mind.CurrentEntity != null;
+            var ghost = IoCManager.Resolve<IEntityManager>()
+                .SpawnEntity("AdminObserver", player.AttachedEntity?.Transform.Coordinates
+                                              ?? IoCManager.Resolve<IGameTicker>().GetObserverSpawnPoint());
+
+            if (canReturn)
+            {
+                ghost.Name = mind.CharacterName;
+                mind.Visit(ghost);
             }
             else
             {
-                var canReturn = mind.CurrentEntity != null;
-                var ghost = IoCManager.Resolve<IEntityManager>()
-                    .SpawnEntity("AdminObserver", player.AttachedEntity?.Transform.Coordinates
-                                                  ?? IoCManager.Resolve<IGameTicker>().GetObserverSpawnPoint());
-
-                if (canReturn)
-                {
-                    ghost.Name = mind.CharacterName;
-                    mind.Visit(ghost);
-                }
-                else
-                {
-                    ghost.Name = player.Name;
-                    mind.TransferTo(ghost);
-                }
-
-                ghost.GetComponent<GhostComponent>().CanReturnToBody = canReturn;
+                ghost.Name = player.Name;
+                mind.TransferTo(ghost);
             }
+
+            ghost.GetComponent<GhostComponent>().CanReturnToBody = canReturn;
         }
     }
 }