diff --git a/PallyPower.lua b/PallyPower.lua
index fb3fa2d..a33e8b7 100644
--- a/PallyPower.lua
+++ b/PallyPower.lua
@@ -206,6 +206,8 @@ function PallyPower:OnDisable()
 	self.autoButton:Hide()
 	PallyPowerAnchor:Hide()
 	self:UnbindKeys()
+	self:UnregisterAllEvents()
+	self:UnregisterAllBuckets()
 end
 
 function PallyPower:OnProfileChanged()