diff --git a/ground/gcs/src/plugins/setupwizard/pages/escpage.cpp b/ground/gcs/src/plugins/setupwizard/pages/escpage.cpp
index 8b84ec861..20be547ab 100644
--- a/ground/gcs/src/plugins/setupwizard/pages/escpage.cpp
+++ b/ground/gcs/src/plugins/setupwizard/pages/escpage.cpp
@@ -79,7 +79,25 @@ bool EscPage::isSynchOrOneShotAvailable()
     case SetupWizard::CONTROLLER_NANO:
     case SetupWizard::CONTROLLER_CC:
     case SetupWizard::CONTROLLER_CC3D:
-        available = getWizard()->getInputType() != SetupWizard::INPUT_PWM;
+        switch (getWizard()->getVehicleType()) {
+        case SetupWizard::VEHICLE_MULTI:
+            switch (getWizard()->getVehicleSubType()) {
+            case SetupWizard::MULTI_ROTOR_TRI_Y:
+            case SetupWizard::MULTI_ROTOR_QUAD_X:
+            case SetupWizard::MULTI_ROTOR_QUAD_H:
+            case SetupWizard::MULTI_ROTOR_QUAD_PLUS:
+                available = getWizard()->getInputType() != SetupWizard::INPUT_PWM;
+                break;
+            default:
+                available = false;
+                break;
+            }
+            break;
+        default:
+            break;
+        }
+    case SetupWizard::CONTROLLER_REVO:
+        available = true;
         break;
     default:
         break;