diff --git a/modules/autoshift.lua b/modules/autoshift.lua
index 775d9d2b..7566ed57 100644
--- a/modules/autoshift.lua
+++ b/modules/autoshift.lua
@@ -81,6 +81,12 @@ pfUI:RegisterModule("autoshift", function ()
   pfUI.autoshift:SetScript("OnEvent", function()
       pfUI.autoshift.lastError = arg1
       local CancelLater = nil
+
+      if arg1 == SPELL_FAILED_NOT_STANDING then
+        SitOrStand()
+        return
+      end
+
       for id, errorstring in pairs(pfUI.autoshift.errors) do
         if arg1 == errorstring then
           for i=0,15,1 do