diff --git a/db/Changelog.txt b/db/Changelog.txt
index 7ba66af2e6..9b440e7405 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -26,6 +26,8 @@
 	-----
 
 =========================
+06/07
+	* Stormy Knight card now freezes when attack rather then when hit [Playtester]
 06/06
 	* Fixed Owl Duke not having boss mode [Playtester]
 	* Fixed Osiris's slaves [Playtester]
diff --git a/db/item_db.txt b/db/item_db.txt
index fa7eeb98a9..7b6d33678e 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1455,7 +1455,7 @@
 4315,Pest_Card,Pest Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stone,1000+2000*(readparam(bInt)>=77); },{},{}
 4316,False_Angel_Card,False Angel Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Angel,5; },{ },{ heal 0,-5; }
 4317,Mobster_Card,Mobster Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,15; if(BaseClass == Job_Thief) bonus bCritical,4; },{},{}
-4318,Stormy_Knight_Card,Stormy Knight Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,89,2,20; bonus2 bAddEffWhenHit,Eff_Freeze,2000; },{},{}
+4318,Stormy_Knight_Card,Stormy Knight Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,89,2,20; bonus2 bAddEff,Eff_Freeze,2000; },{},{}
 4319,Freezer_Card,Freezer Card,6,,10,10,,,,,,,,64,,,,,{ bonus bMaxHP,300; if(getrefine()>=9) bonus2 bSkillAtk,5,10; if(isequipped(4246,4311,4220,4331)) { bonus bStr,10; bonus bMaxHPrate,20; bonus bHPrecovRate,50; bonus4 bAutoSpell,112,1,3,0; bonus2 bAddMonsterDropItem,501,100; if(BaseClass == Job_Swordman) { bonus2 bAddItemHealRate,IG_Potion,50; } } },{},{}
 4320,Bloody_Knight_Card,Bloody Knight Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,83,1,20; },{},{}
 4321,Hylozoist_Card,Hylozoist Card,6,,10,10,,,,,,,,136,,,,,{ bonus bClassChange,100; },{},{}