diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BalloonsPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BalloonsPage.java
index 4d7b0276c..fd0b3cf08 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BalloonsPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BalloonsPage.java
@@ -31,7 +31,7 @@ public class BalloonsPage extends GadgetPage
 		{
 			addGadget(gadget, slot);
 
-			if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.BALLOON) == gadget)
+			if (gadget.isActive(getPlayer()))
 				addGlow(slot);
 
 			slot++;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java
index 84145cc44..2f0cb64ac 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java
@@ -53,8 +53,12 @@ public abstract class BalloonGadget extends Gadget
 	@Override
 	public void disableCustom(Player player, boolean message)
 	{
+		if (!_active.remove(player))
+			return;
+
 		removePlayerBalloon(player);
-		UtilPlayer.message(player, F.main("Gadget", "You despawned a " + F.elem(getName())) + "!");
+		if (message)
+			UtilPlayer.message(player, F.main("Gadget", "You despawned a " + F.elem(getName())) + "!");
 	}
 
 	private boolean addPlayerBalloon(Player player)