What model switch? Which driver is it using?
If it is using the stock Edge driver from ST, I would recommend switching to this driver [ST Edge] Driver for GE/Jasco/Honeywell Z-Wave Switches, Dimmers, Fans, Outlets, and Plug-Ins from @philh30. Many people have better luck with their GE device behaviors with his driver.