diff --git a/src/gibstick/bukkit/discosheep/DiscoSheep.java b/src/gibstick/bukkit/discosheep/DiscoSheep.java
index 52c1848..3fe3bcd 100644
--- a/src/gibstick/bukkit/discosheep/DiscoSheep.java
+++ b/src/gibstick/bukkit/discosheep/DiscoSheep.java
@@ -20,6 +20,9 @@ public final class DiscoSheep extends JavaPlugin {
 
 	@Override
 	public void onDisable() {
+		for (String key:getPartyMap().keySet()) {
+			stopParty(key);
+		}
 	}
 
 	public Map<String, DiscoParty> getPartyMap() {