diff --git a/EXILED/Exiled.API/Features/Items/Item.cs b/EXILED/Exiled.API/Features/Items/Item.cs
index 2c32585711..22606adfda 100644
--- a/EXILED/Exiled.API/Features/Items/Item.cs
+++ b/EXILED/Exiled.API/Features/Items/Item.cs
@@ -311,7 +311,7 @@ public static T Get<T>(ushort serial)
             BodyArmor => new Armor(type),
             AmmoItem => new Ammo(type),
             ToggleableLightItemBase => new Flashlight(type),
-            JailbirdItem jailbird => new Jailbird(jailbird),
+            JailbirdItem => new Jailbird(),
             ThrowableItem throwable => throwable.Projectile switch
             {
                 FlashbangGrenade => new FlashGrenade(owner),
diff --git a/EXILED/Exiled.API/Features/Pickups/Pickup.cs b/EXILED/Exiled.API/Features/Pickups/Pickup.cs
index 95a54ccb5c..77998260a9 100644
--- a/EXILED/Exiled.API/Features/Pickups/Pickup.cs
+++ b/EXILED/Exiled.API/Features/Pickups/Pickup.cs
@@ -495,12 +495,12 @@ public static IEnumerable<T> Get<T>(IEnumerable<GameObject> gameObjects)
             ThrownProjectile thrownProjectile => thrownProjectile switch
             {
                 BaseScp018Projectile => new Projectiles.Scp018Projectile(),
-                ExplosionGrenade explosionGrenade => new ExplosionGrenadeProjectile(explosionGrenade),
+                ExplosionGrenade explosionGrenade => new ExplosionGrenadeProjectile(type),
                 FlashbangGrenade => new FlashbangProjectile(),
                 BaseScp2176Projectile => new Projectiles.Scp2176Projectile(),
                 EffectGrenade => new EffectGrenadeProjectile(type),
                 TimeGrenade => new TimeGrenadeProjectile(type),
-                _ => new Projectile(thrownProjectile),
+                _ => new Projectile(type),
             },
             _ => new Pickup(type),
         };
diff --git a/EXILED/Exiled.API/Features/Roles/Scp3114Role.cs b/EXILED/Exiled.API/Features/Roles/Scp3114Role.cs
index 64f6b34088..f5ba440058 100644
--- a/EXILED/Exiled.API/Features/Roles/Scp3114Role.cs
+++ b/EXILED/Exiled.API/Features/Roles/Scp3114Role.cs
@@ -218,6 +218,11 @@ public float WarningTime
             set => Identity._warningTimeSeconds = value;
         }
 
+        /// <summary>
+        /// Gets or sets the next bound dance.
+        /// </summary>
+        public DanceType? NextDanceType { get; set; }
+
         /// <summary>
         /// Gets or sets the bound dance.
         /// </summary>
diff --git a/EXILED/Exiled.Events/EventArgs/Scp3114/DancingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp3114/DancingEventArgs.cs
index 12d1701c4e..49488a20bf 100644
--- a/EXILED/Exiled.Events/EventArgs/Scp3114/DancingEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Scp3114/DancingEventArgs.cs
@@ -29,7 +29,8 @@ public DancingEventArgs(bool newState, Player player, bool isAllowed = true)
             Player = player;
             Scp3114 = player.Role.As<Scp3114Role>();
             IsDancing = newState;
-            DanceType = (DanceType)(newState ? UnityEngine.Random.Range(0, Scp3114.Dance._danceVariants) : byte.MaxValue);
+            DanceType = newState ? (Scp3114.NextDanceType ?? (DanceType)UnityEngine.Random.Range(0, Scp3114.Dance._danceVariants)) : (DanceType)byte.MaxValue;
+            Scp3114.NextDanceType = null;
             IsAllowed = isAllowed;
         }
 
diff --git a/EXILED/Exiled.Events/EventArgs/Server/RespawningTeamEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Server/RespawningTeamEventArgs.cs
index e65bdbf03c..95b0080b36 100644
--- a/EXILED/Exiled.Events/EventArgs/Server/RespawningTeamEventArgs.cs
+++ b/EXILED/Exiled.Events/EventArgs/Server/RespawningTeamEventArgs.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.EventArgs.Server
 {
+    using System;
     using System.Collections.Generic;
 
     using Exiled.API.Features;
@@ -39,7 +40,7 @@ public RespawningTeamEventArgs(List<Player> players, int maxRespawn, SpawnableWa
         {
             Players = players;
             MaximumRespawnAmount = maxRespawn;
-            SpawnQueue = WaveSpawner.SpawnQueue;
+            Wave.PopulateQueue(SpawnQueue, MaximumRespawnAmount);
             Wave = new TimedWave((TimeBasedWave)wave);
             IsAllowed = true;
         }
diff --git a/EXILED/Exiled.Events/Patches/Events/Server/RespawningTeam.cs b/EXILED/Exiled.Events/Patches/Events/Server/RespawningTeam.cs
index 37a470d8ac..47ae586a94 100644
--- a/EXILED/Exiled.Events/Patches/Events/Server/RespawningTeam.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Server/RespawningTeam.cs
@@ -84,6 +84,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new CodeInstruction(OpCodes.Ldloc_S, ev.LocalIndex).WithLabels(continueLabel),
                     new(OpCodes.Dup),
                     new(OpCodes.Dup),
+                    new(OpCodes.Dup),
 
                     // num = ev.MaximumRespawnAmount
                     new(OpCodes.Callvirt, PropertyGetter(typeof(RespawningTeamEventArgs), nameof(RespawningTeamEventArgs.MaximumRespawnAmount))),
@@ -98,8 +99,19 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Callvirt, PropertyGetter(typeof(RespawningTeamEventArgs), nameof(RespawningTeamEventArgs.Wave))),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(TimedWave), nameof(TimedWave.Base))),
                     new(OpCodes.Starg_S, 0),
+
+                    // WaveSpawner.SpawnQueue = ev.SpawnQueue;
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(RespawningTeamEventArgs), nameof(RespawningTeamEventArgs.SpawnQueue))),
+                    new(OpCodes.Stsfld, Field(typeof(WaveSpawner), nameof(WaveSpawner.SpawnQueue))),
                 });
 
+            // remove "wave.PopulateQueue(WaveSpawner.SpawnQueue, num);"
+            offset = -3;
+            index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(SpawnableWaveBase), nameof(SpawnableWaveBase.PopulateQueue)))) + offset;
+            List<Label> extractLabels = newInstructions[index].ExtractLabels();
+            newInstructions.RemoveRange(index, 4);
+            newInstructions[index].WithLabels(extractLabels);
+
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
 
@@ -109,12 +121,5 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
         private static List<Player> GetPlayers(List<ReferenceHub> hubs) => hubs.Select(Player.Get).ToList();
 
         private static List<ReferenceHub> GetHubs(List<Player> players) => players.Select(player => player.ReferenceHub).ToList();
-
-        private static void RefillQueue(Queue<RoleTypeId> newQueue)
-        {
-            WaveSpawner.SpawnQueue.Clear();
-            foreach (RoleTypeId role in newQueue)
-                WaveSpawner.SpawnQueue.Enqueue(role);
-        }
     }
 }
diff --git a/EXILED/Exiled.Events/Patches/Fixes/ServerSideDancesPatch.cs b/EXILED/Exiled.Events/Patches/Fixes/ServerSideDancesPatch.cs
deleted file mode 100644
index 114f14c0aa..0000000000
--- a/EXILED/Exiled.Events/Patches/Fixes/ServerSideDancesPatch.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// -----------------------------------------------------------------------
-// <copyright file="ServerSideDancesPatch.cs" company="ExMod Team">
-// Copyright (c) ExMod Team. All rights reserved.
-// Licensed under the CC BY-SA 3.0 license.
-// </copyright>
-// -----------------------------------------------------------------------
-
-namespace Exiled.Events.Patches.Fixes
-{
-#pragma warning disable SA1313
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using API.Features.Pools;
-    using Exiled.API.Features;
-    using HarmonyLib;
-    using Mirror;
-    using PlayerRoles.PlayableScps.Scp3114;
-    using PlayerRoles.Subroutines;
-    using UnityEngine;
-
-    using static HarmonyLib.AccessTools;
-
-    using Scp3114Role = API.Features.Roles.Scp3114Role;
-
-    /// <summary>
-    /// Patches the <see cref="Scp3114Dance.DanceVariant"/>.
-    /// Fix that the game doesn't write this.
-    /// </summary>
-    [HarmonyPatch(typeof(Scp3114Dance), nameof(Scp3114Dance.ServerWriteRpc))]
-    internal class ServerSideDancesPatch
-    {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
-
-            Label skip = generator.DefineLabel();
-
-            newInstructions.Add(new CodeInstruction(OpCodes.Ret));
-            newInstructions[newInstructions.Count - 1].labels.Add(skip);
-
-            int offset = 4;
-            int index = newInstructions.FindIndex(x => x.Calls(Method(typeof(SubroutineBase), nameof(SubroutineBase.ServerWriteRpc)))) + offset;
-
-            newInstructions.InsertRange(index, new List<CodeInstruction>()
-            {
-                new CodeInstruction(OpCodes.Br_S, skip),
-            });
-
-            foreach (CodeInstruction instruction in newInstructions)
-                yield return instruction;
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
-
-        private static void Postfix(ref Scp3114Dance __instance, NetworkWriter writer)
-        {
-            Player player = Player.Get(__instance.Owner);
-
-            Scp3114Role role = player.Role as Scp3114Role;
-
-            if (player != null && role.DanceType != API.Enums.DanceType.None)
-            {
-                writer.WriteByte((byte)role.DanceType);
-                return;
-            }
-
-            writer.WriteByte((byte)Random.Range(0, 255));
-            return;
-        }
-    }
-}