diff --git a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
index 0e0d8042b0..db5e599cd3 100644
--- a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
+++ b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
@@ -37,14 +37,6 @@ namespace Exiled.CustomRoles.API.Features
     /// </summary>
     public abstract class CustomRole
     {
-        /// <summary>
-        /// Gets or sets the number of players that naturally spawned with this custom role.
-        /// </summary>
-        [YamlIgnore]
-        #pragma warning disable SA1401 // Fields should be private
-        public int SpawnedPlayers = 0;
-        #pragma warning restore SA1401 // Fields should be private
-
         private const float AddRoleDelay = 0.25f;
 
         private static Dictionary<Type, CustomRole?> typeLookupTable = new();
@@ -184,6 +176,12 @@ public abstract class CustomRole
         /// </summary>
         public virtual string AbilityUsage { get; set; } = "Enter \".special\" in the console to use your ability. If you have multiple abilities, you can use this command to cycle through them, or specify the one to use with \".special ROLENAME AbilityNum\"";
 
+        /// <summary>
+        /// Gets or sets the number of players that naturally spawned with this custom role.
+        /// </summary>
+        [YamlIgnore]
+        public int SpawnedPlayers { get; set; }
+
         /// <summary>
         /// Gets a <see cref="CustomRole"/> by ID.
         /// </summary>
diff --git a/EXILED/Exiled.CustomRoles/Events/PlayerHandlers.cs b/EXILED/Exiled.CustomRoles/Events/PlayerHandlers.cs
index 5c0aa7356e..1a10e38dcf 100644
--- a/EXILED/Exiled.CustomRoles/Events/PlayerHandlers.cs
+++ b/EXILED/Exiled.CustomRoles/Events/PlayerHandlers.cs
@@ -22,8 +22,7 @@ namespace Exiled.CustomRoles.Events
     /// </summary>
     public class PlayerHandlers
     {
-        private readonly CustomRoles plugin;
-        private readonly HashSet<SpawnReason> validSpawnReasons = new()
+        private static readonly HashSet<SpawnReason> ValidSpawnReasons = new()
         {
             SpawnReason.RoundStart,
             SpawnReason.Respawn,
@@ -33,6 +32,8 @@ public class PlayerHandlers
             SpawnReason.ItemUsage,
         };
 
+        private readonly CustomRoles plugin;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PlayerHandlers"/> class.
         /// </summary>
@@ -64,7 +65,7 @@ internal void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         /// <inheritdoc cref="Exiled.Events.Handlers.Player.Spawning"/>
         internal void OnSpawned(SpawnedEventArgs ev)
         {
-            if (!validSpawnReasons.Contains(ev.Reason) || ev.Player.HasAnyCustomRole())
+            if (!ValidSpawnReasons.Contains(ev.Reason) || ev.Player.HasAnyCustomRole())
             {
                 return;
             }
@@ -108,7 +109,7 @@ internal void OnSpawned(SpawnedEventArgs ev)
                     break;
                 }
 
-                int newSpawnCount = Interlocked.Increment(ref candidateRole.SpawnedPlayers);
+                int newSpawnCount = candidateRole.SpawnedPlayers++;
                 if (newSpawnCount <= candidateRole.SpawnProperties.Limit)
                 {
                     candidateRole.AddRole(ev.Player);
@@ -116,7 +117,7 @@ internal void OnSpawned(SpawnedEventArgs ev)
                 }
                 else
                 {
-                    Interlocked.Decrement(ref candidateRole.SpawnedPlayers);
+                    candidateRole.SpawnedPlayers--;
                     randomRoll -= candidateRole.SpawnChance;
                 }
             }