Sometimes, UPS will not fix the problem as they have only basic AC mains filtering. We have recently moved away from UPS and moved to dedicated mains filters. This (on AC Main tests) Has proved to remove the 2500V+ spikes we were getting, and also protects against mains noise often generated in high AC use environments, which the UPS would not fix.