diff --git a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
index ffb364760e..97790a3e24 100644
--- a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
+++ b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
@@ -936,7 +936,7 @@ private void OnInternalChangingRole(ChangingRoleEventArgs ev)
 
         private void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         {
-            if (Check(ev.Player) && !Role.IsDead() && Role != RoleTypeId.Scp079)
+            if (Check(ev.Player) && Role.IsFpcRole())
                 ev.Role = Role;
         }
 
diff --git a/EXILED/Exiled.Events/Handlers/Internal/Round.cs b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
index 7df3f63007..ae8dbb5b4e 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/Round.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/Round.cs
@@ -85,7 +85,7 @@ public static void OnChangingRole(ChangingRoleEventArgs ev)
         /// <inheritdoc cref="Handlers.Player.OnSpawningRagdoll(SpawningRagdollEventArgs)" />
         public static void OnSpawningRagdoll(SpawningRagdollEventArgs ev)
         {
-            if (ev.Role.IsDead() || ev.Role == RoleTypeId.Scp079)
+            if (ev.Role.IsDead() || ev.Role.IsFpcRole())
                 ev.IsAllowed = false;
         }