diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index e11f8900dad..205acb415ff 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -15094,7 +15094,7 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
-	SkillData1: 180000
+	SkillData1: 180_000 // Duration of SC_OVERTHRUSTMAX (in milliseconds)
 	CoolDown: 0
 	Requirements: {
 		SPCost: 15
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 7fdd395fdef..6fa653bc0d5 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -15238,7 +15238,7 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
-	SkillData1: 180000
+	SkillData1: 180_000 // Duration of SC_OVERTHRUSTMAX (in milliseconds)
 	FixedCastTime: 0
 	Requirements: {
 		SPCost: 15
diff --git a/src/map/skill.c b/src/map/skill.c
index f8a8feb7a1f..08dc6ded90e 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2405,11 +2405,11 @@ static int skill_additional_effect(struct block_list *src, struct block_list *bl
 				if(sc->data[SC_GIANTGROWTH])
 					rate += 10;
 #ifndef RENEWAL
-				if(sc->data[SC_OVERTHRUST])
+				if(sc->data[SC_OVERTHRUST] != NULL)
 					rate += 10;
-#endif
-				if(sc->data[SC_OVERTHRUSTMAX])
+				if(sc->data[SC_OVERTHRUSTMAX] != NULL)
 					rate += 10;
+#endif
 			}
 			if( rate )
 				skill->break_equip(src, EQP_WEAPON, rate, BCT_SELF);