diff --git a/HappyHour/scripting/HappyHour.sp b/HappyHour/scripting/HappyHour.sp
index ae9a9d45..54ebab72 100644
--- a/HappyHour/scripting/HappyHour.sp
+++ b/HappyHour/scripting/HappyHour.sp
@@ -72,7 +72,10 @@ public void GetConVars()
 public void ConVarChange(ConVar convar, char[] oldValue, char[] newValue)
 {
 	GetConVars();
-	KillTimer(g_h_MessageTimer);
+
+	if (g_h_MessageTimer != INVALID_HANDLE && CloseHandle(g_h_MessageTimer))
+		g_h_MessageTimer = INVALID_HANDLE;
+
 	g_h_MessageTimer = CreateTimer(g_fMessageTimer, MessageHappyHour, _, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE);
 }