diff --git a/engine/class_modules/sc_mage.cpp b/engine/class_modules/sc_mage.cpp
index ab4ab2a8b97..558cbe366f7 100644
--- a/engine/class_modules/sc_mage.cpp
+++ b/engine/class_modules/sc_mage.cpp
@@ -2361,18 +2361,12 @@ struct hot_streak_spell_t : public custom_state_spell_t<fire_mage_spell_t, hot_s
 
     c += p()->buffs.hyperthermia->check_value();
 
-    return c;
-  }
-
-  result_e calculate_result( action_state_t* s ) const override
-  {
-    result_e r = custom_state_spell_t::calculate_result( s );
-
-    // TODO: Pyroclasm 2pc is likely scripted. Fuel the Fire does not see the increased crit chance.
-    if ( r == RESULT_HIT && pyroclasm_active() && p()->sets->has_set_bonus( MAGE_FIRE, MID2, B2 ) )
-      r = RESULT_CRIT;
+    // The spelldata for Pyroclasm and the 12.1 2pc doesn't seem to be used,
+    // so we're hardcoding it here as they probably did serverside.
+    if ( pyroclasm_active() && p()->sets->has_set_bonus( MAGE_FIRE, MID2, B2 ) )
+      c += 1.0;
 
-    return r;
+    return c;
   }
 
   double composite_da_multiplier( const action_state_t* s ) const override