diff --git a/libraries/AR_Motors/AP_MotorsUGV.cpp b/libraries/AR_Motors/AP_MotorsUGV.cpp
index 061c1b3a25b..c9e351b2be0 100644
--- a/libraries/AR_Motors/AP_MotorsUGV.cpp
+++ b/libraries/AR_Motors/AP_MotorsUGV.cpp
@@ -142,7 +142,7 @@ void AP_MotorsUGV::init(uint8_t frtype)
     setup_safety_output();
 
     // setup for omni vehicles
-    if (is_omni()) {
+    if (_frame_type != FRAME_TYPE_UNDEFINED) {
         setup_omni();
     }
 }