diff --git a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
index 5b226ca2d2..6efb5867c9 100644
--- a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
+++ b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
@@ -586,10 +586,14 @@ public virtual void AddRole(Player player)
             player.Scale = Scale;
             if (Gravity.HasValue && player.Role is FpcRole fpcRole)
                 fpcRole.Gravity = Gravity.Value;
-            Vector3 position = GetSpawnPosition();
-            if (position != Vector3.zero)
+
+            if (!KeepPositionOnSpawn)
             {
-                player.Position = position;
+                Vector3 position = GetSpawnPosition();
+                if (position != Vector3.zero)
+                {
+                    player.Position = position;
+                }
             }
 
             Log.Debug($"{Name}: Setting player info");