diff --git a/addons/sourcemod/configs/shavit-styles.cfg b/addons/sourcemod/configs/shavit-styles.cfg
index 2c297921..21938c74 100644
--- a/addons/sourcemod/configs/shavit-styles.cfg
+++ b/addons/sourcemod/configs/shavit-styles.cfg
@@ -184,7 +184,7 @@
 
 		"force_hsw"			"1"
 
-		"strafe_count_w"	"1"
+		"strafe_count_w"	"0"
 		"strafe_count_a"	"1"
 		"strafe_count_s"	"0"
 		"strafe_count_d"	"1"
diff --git a/addons/sourcemod/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
index 015b2967..78b7f354 100644
--- a/addons/sourcemod/scripting/shavit-core.sp
+++ b/addons/sourcemod/scripting/shavit-core.sp
@@ -3321,6 +3321,7 @@ public void OnPlayerRunCmdPost(int client, int buttons, int impulse, const float
 	if (GetStyleSettingBool(gA_Timers[client].bsStyle, "strafe_count_w")
 	&& !GetStyleSettingBool(gA_Timers[client].bsStyle, "block_w")
 	&& (gA_Timers[client].fLastInputVel[0] <= 0.0) && (vel[0] > 0.0)
+	&& GetStyleSettingInt(gA_Timers[client].bsStyle, "force_hsw") != 1
 	)
 	{
 		gA_Timers[client].iStrafes++;