diff --git a/src/main.lua b/src/main.lua
index 2e195f1..5b54bb7 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -125,9 +125,15 @@ local function MakeMountButton(name, forceGround)
             self:SetAttribute("type1", "item")
             self:SetAttribute("item1", mount.bag .. " " .. mount.slot)
         elseif mount and type(mount) == "number" then
-            self:SetAttribute("type1", "spell")
-            self:SetAttribute("item1", nil)
-            self:SetAttribute("spell1", mount)
+            if C_UnitAuras.GetPlayerAuraBySpellID(mount) then
+                self:SetAttribute("type1", "cancelaura")
+                self:SetAttribute("item1", nil)
+                self:SetAttribute("spell1", mount)
+            else
+                self:SetAttribute("type1", "spell")
+                self:SetAttribute("item1", nil)
+                self:SetAttribute("spell1", mount)
+            end
         else
             self:SetAttribute("item1", nil)
             self:SetAttribute("spell1", nil)