diff --git a/Classes/HunterBeastMastery.lua b/Classes/HunterBeastMastery.lua
index a9ef536b7..7fbe0dbb8 100644
--- a/Classes/HunterBeastMastery.lua
+++ b/Classes/HunterBeastMastery.lua
@@ -679,6 +679,10 @@ if UnitClassBase( "player" ) == "HUNTER" then
         if debuff.tar_trap.up then
             debuff.tar_trap.expires = debuff.tar_trap.applied + 30
         end
+
+        if active_dot.resonating_arrow > 0 then
+            applyBuff( "resonating_arrow", max( debuff.resonating_arrow.remains, action.resonating_arrow.lastCast + buff.resonating_arrow.duration ) )
+        end
     end )
 
 
@@ -1778,6 +1782,7 @@ if UnitClassBase( "player" ) == "HUNTER" then
             handler = function ()
                 applyDebuff( "target", "resonating_arrow" )
                 active_dot.resonating_arrow = active_enemies
+                applyBuff( "resonating_arrow" )
             end,
 
             toggle = "essences",
diff --git a/Classes/HunterMarksmanship.lua b/Classes/HunterMarksmanship.lua
index f0b988c47..2c0587898 100644
--- a/Classes/HunterMarksmanship.lua
+++ b/Classes/HunterMarksmanship.lua
@@ -297,6 +297,10 @@ if UnitClassBase( "player" ) == "HUNTER" then
 
         if now - action.volley.lastCast < 6 then applyBuff( "volley", 6 - ( now - action.volley.lastCast ) ) end
 
+        if active_dot.resonating_arrow > 0 then
+            applyBuff( "resonating_arrow", max( debuff.resonating_arrow.remains, action.resonating_arrow.lastCast + buff.resonating_arrow.duration ) )
+        end        
+
         last_steady_focus = nil
     end )
 
diff --git a/Classes/HunterSurvival.lua b/Classes/HunterSurvival.lua
index 0fd6865f4..9e42f2b32 100644
--- a/Classes/HunterSurvival.lua
+++ b/Classes/HunterSurvival.lua
@@ -388,6 +388,10 @@ if UnitClassBase( "player" ) == "HUNTER" then
         if debuff.tar_trap.up then
             debuff.tar_trap.expires = debuff.tar_trap.applied + 30
         end
+
+        if active_dot.resonating_arrow > 0 then
+            applyBuff( "resonating_arrow", max( debuff.resonating_arrow.remains, action.resonating_arrow.lastCast + buff.resonating_arrow.duration ) )
+        end
     end )
 
     spec:RegisterHook( "specializationChanged", function ()