diff --git a/Content.Client/UserInterface/CharacterSetupGui.cs b/Content.Client/UserInterface/CharacterSetupGui.cs
index e058047a0d..e247277141 100644
--- a/Content.Client/UserInterface/CharacterSetupGui.cs
+++ b/Content.Client/UserInterface/CharacterSetupGui.cs
@@ -209,8 +209,7 @@ namespace Content.Client.UserInterface
                 ButtonGroup group,
                 ICharacterProfile profile)
             {
-                _previewDummy = entityManager.SpawnEntityAt("HumanMob_Dummy",
-                    new MapCoordinates(Vector2.Zero, MapId.Nullspace));
+                _previewDummy = entityManager.SpawnEntityAt("HumanMob_Dummy", MapCoordinates.Nullspace);
                 _previewDummy.GetComponent<HumanoidAppearanceComponent>().UpdateFromProfile(profile);
                 var humanoid = profile as HumanoidCharacterProfile;
                 if (humanoid != null)
diff --git a/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs b/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs
index 33548ad904..5f807cb3c1 100644
--- a/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs
+++ b/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs
@@ -29,8 +29,7 @@ namespace Content.Client.UserInterface
             IClientPreferencesManager preferencesManager)
         {
             _preferencesManager = preferencesManager;
-            _previewDummy = entityManager.SpawnEntityAt("HumanMob_Dummy",
-                new MapCoordinates(Vector2.Zero, MapId.Nullspace));
+            _previewDummy = entityManager.SpawnEntityAt("HumanMob_Dummy", MapCoordinates.Nullspace);
 
             var header = new NanoHeading
             {
@@ -122,8 +121,7 @@ namespace Content.Client.UserInterface
 
             foreach (var (slot, itemType) in gear.Equipment)
             {
-                var item = entityMan
-                    .SpawnEntityAt(itemType, new MapCoordinates(Vector2.Zero, MapId.Nullspace));
+                var item = entityMan.SpawnEntityAt(itemType, MapCoordinates.Nullspace);
 
                 inventory.SetSlotVisuals(slot, item);
 
diff --git a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
index 3f184b4b32..0907878804 100644
--- a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
+++ b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
@@ -36,13 +36,11 @@ namespace Content.IntegrationTests.Tests
 
                 var entityMan = IoCManager.Resolve<IEntityManager>();
 
-                var nullspace = new MapCoordinates(Vector2.Zero, MapId.Nullspace);
-
-                human = entityMan.SpawnEntityAt("HumanMob_Content", nullspace);
-                uniform = entityMan.SpawnEntityAt("JanitorUniform", nullspace);
-                idCard = entityMan.SpawnEntityAt("IDCardStandard", nullspace);
-                pocketItem = entityMan.SpawnEntityAt("FlashlightLantern", nullspace);
-                var tooBigItem = entityMan.SpawnEntityAt("RedToolboxItem", nullspace);
+                human = entityMan.SpawnEntityAt("HumanMob_Content", MapCoordinates.Nullspace);
+                uniform = entityMan.SpawnEntityAt("JanitorUniform", MapCoordinates.Nullspace);
+                idCard = entityMan.SpawnEntityAt("IDCardStandard", MapCoordinates.Nullspace);
+                pocketItem = entityMan.SpawnEntityAt("FlashlightLantern", MapCoordinates.Nullspace);
+                var tooBigItem = entityMan.SpawnEntityAt("RedToolboxItem", MapCoordinates.Nullspace);
 
                 inventory = human.GetComponent<InventoryComponent>();