diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
index 7c16e6c3a..727c27b9a 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
@@ -376,18 +376,19 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
         bankMode     = ActuatorSettings::BANKMODE_PWM;
         break;
     case VehicleConfigurationSource::ESC_RAPID:
-        escFrequence = RAPID_ESC_FREQUENCY;
         if ((m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_CC ||
              m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_CC3D) &&
             m_configSource->getInputType() == VehicleConfigurationSource::INPUT_PWM) {
             bankMode = ActuatorSettings::BANKMODE_PWM;
+            escFrequence = RAPID_ESC_FREQUENCY;
         } else {
             bankMode = ActuatorSettings::BANKMODE_PWMSYNC;
+            escFrequence = PWMSYNC_ESC_FREQUENCY;
         }
         break;
     case VehicleConfigurationSource::ESC_ONESHOT:
-        escFrequence = RAPID_ESC_FREQUENCY;
         bankMode     = ActuatorSettings::BANKMODE_ONESHOT125;
+        escFrequence = ONESHOT_ESC_FREQUENCY;
         break;
     default:
         break;
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h
index fd2d83d65..28caca77c 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h
@@ -59,6 +59,8 @@ public:
     bool setupHardwareSettings(bool save = true);
     static const qint16 LEGACY_ESC_FREQUENCY    = 50;
     static const qint16 RAPID_ESC_FREQUENCY     = 490;
+    static const qint16 PWMSYNC_ESC_FREQUENCY    = 0;
+    static const qint16 ONESHOT_ESC_FREQUENCY    = 0;
     static const qint16 ANALOG_SERVO_FREQUENCY  = 50;
     static const qint16 DIGITAL_SERVO_FREQUENCY = 333;
     static const int MIXER_TYPE_NONE = 0;