diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
index 27b6bf932..55ceae0c8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
@@ -1142,8 +1142,7 @@ public class GadgetManager extends MiniPlugin
 				if (gadget instanceof KitSelectorGadget)
 					continue;
 
-				for (Player player : UtilServer.getPlayers())
-					gadget.disable(player);
+				gadget.disableForAll();
 			}
 		}
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
index 26487fa00..c1d4dce53 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -1700,7 +1700,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 	@EventHandler(priority = EventPriority.HIGH)
 	public void disableGadgetsInGame(GadgetEnableEvent event)
 	{
-		if (_game != null && _game.InProgress() && _game.GadgetsDisabled)
+		if (_game != null && _game.InProgress() && _game.GadgetsDisabled && event.getGadget().getGadgetType() == GadgetType.COSTUME)
 		{
 			event.setShowMessage(false);
 			event.setCancelled(true);