diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/PortalArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/PortalArtifactSystem.cs
index e2d21723550b9e..e44ee6baa12f83 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/PortalArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/PortalArtifactSystem.cs
@@ -35,8 +35,7 @@ private void OnActivate(Entity<PortalArtifactComponent> artifact, ref ArtifactAc
         var secondPortal = Spawn(artifact.Comp.PortalProto, _transform.GetMapCoordinates(target));
 
         //Manual position swapping, because the portal that opens doesn't trigger a collision, and doesn't teleport targets the first time.
-        _transform.SetCoordinates(artifact, Transform(secondPortal).Coordinates);
-        _transform.SetCoordinates(target, Transform(firstPortal).Coordinates);
+        _transform.SwapPositions(target, secondPortal);
 
         _link.TryLink(firstPortal, secondPortal, true);
     }
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs
index b977cb038c982c..c39627818a1f17 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs
@@ -22,7 +22,6 @@ private void OnActivated(EntityUid uid, ShuffleArtifactComponent component, Arti
     {
         var mobState = GetEntityQuery<MobStateComponent>();
 
-        List<EntityCoordinates> allCoords = new();
         List<Entity<TransformComponent>> toShuffle = new();
 
         foreach (var ent in _lookup.GetEntitiesInRange(uid, component.Radius, LookupFlags.Dynamic | LookupFlags.Sundries))
@@ -33,13 +32,15 @@ private void OnActivated(EntityUid uid, ShuffleArtifactComponent component, Arti
             var xform = Transform(ent);
 
             toShuffle.Add((ent, xform));
-            allCoords.Add(xform.Coordinates);
         }
 
-        foreach (var xform in toShuffle)
+        _random.Shuffle(toShuffle);
+
+        while (toShuffle.Count > 1)
         {
-            var xformUid = xform.Owner;
-            _xform.SetCoordinates(xformUid, xform, _random.PickAndTake(allCoords));
+            var ent1 = _random.PickAndTake(toShuffle);
+            var ent2 = _random.PickAndTake(toShuffle);
+            _xform.SwapPositions((ent1, ent1), (ent2, ent2));
         }
     }
 }
diff --git a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
index e69a31a1d406e7..62c0b0f44e416c 100644
--- a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
+++ b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
@@ -145,27 +145,14 @@ public void DoTeleport(Entity<SwapTeleporterComponent, TransformComponent> ent)
         }
 
         var teleEnt = GetTeleportingEntity((uid, xform));
-        var teleEntXform = Transform(teleEnt);
         var otherTeleEnt = GetTeleportingEntity((linkedEnt, Transform(linkedEnt)));
-        var otherTeleEntXform = Transform(otherTeleEnt);
 
         _popup.PopupEntity(Loc.GetString("swap-teleporter-popup-teleport-other",
             ("entity", Identity.Entity(linkedEnt, EntityManager))),
             otherTeleEnt,
             otherTeleEnt,
             PopupType.MediumCaution);
-        var pos = teleEntXform.Coordinates;
-        var otherPos = otherTeleEntXform.Coordinates;
-
-        if (_transform.ContainsEntity(teleEnt, (otherTeleEnt, otherTeleEntXform)) ||
-            _transform.ContainsEntity(otherTeleEnt, (teleEnt, teleEntXform)))
-        {
-            Log.Error($"Invalid teleport swap attempt between {ToPrettyString(teleEnt)} and {ToPrettyString(otherTeleEnt)}");
-            return;
-        }
-
-        _transform.SetCoordinates(teleEnt, otherPos);
-        _transform.SetCoordinates(otherTeleEnt, pos);
+        _transform.SwapPositions(teleEnt, otherTeleEnt);
     }
 
     /// <remarks>