diff --git a/Modules/Macroer.lua b/Modules/Macroer.lua
index c46d2c5..96b1f8a 100644
--- a/Modules/Macroer.lua
+++ b/Modules/Macroer.lua
@@ -25,6 +25,8 @@ function shared.Macroer.Init()
 
     ---@param stinkies table<string, stinky>
     local function FixMacro(stinkies)
+        if not Heimdall_Data.config.macroer.enabled then return end
+        if InCombatLockdown() then return end
         local priorityMap = {}
         for priority, className in ipairs(Heimdall_Data.config.macroer.priority) do
             priorityMap[className] = priority