diff --git a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp
index f0e473657..d20c95397 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp
@@ -167,7 +167,8 @@ void ConnectionDiagram::setupGraphicsScene()
         case VehicleConfigurationSource::CONTROLLER_CC:
         case VehicleConfigurationSource::CONTROLLER_CC3D:
             prefix = "cc-";
-            if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT) {
+            if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT ||
+                    m_configSource->getEscType() == VehicleConfigurationSource::ESC_RAPID) {
                 suffix = "-oneshot";
             }
             break;