diff --git a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
index 4c4fb6a57f75874bad3b6afb3c3e5e171f07b128..126d96834f0253d24215f9d00d54e1927647aefb 100644
--- a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
+++ b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
@@ -63,9 +63,11 @@ const QVariantList& APMAutoPilotPlugin::vehicleComponents(void)
             _airframeComponent->setupTriggerSignals();
             _components.append(QVariant::fromValue((VehicleComponent*)_airframeComponent));
 
-            _radioComponent = new APMRadioComponent(_vehicle, this);
-            _radioComponent->setupTriggerSignals();
-            _components.append(QVariant::fromValue((VehicleComponent*)_radioComponent));
+            if ( !_vehicle->sub() ) {
+                _radioComponent = new APMRadioComponent(_vehicle, this);
+                _radioComponent->setupTriggerSignals();
+                _components.append(QVariant::fromValue((VehicleComponent*)_radioComponent));
+            }
 
             _flightModesComponent = new APMFlightModesComponent(_vehicle, this);
             _flightModesComponent->setupTriggerSignals();
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index dae78daaaee6ec548405639465c9f764f6067bb8..b507c317347e4ff5e7b067606703612e53c2cd10 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -1474,6 +1474,11 @@ bool Vehicle::rover(void) const
     return vehicleType() == MAV_TYPE_GROUND_ROVER;
 }
 
+bool Vehicle::sub(void) const
+{
+    return vehicleType() == MAV_TYPE_SUBMARINE;
+}
+
 bool Vehicle::multiRotor(void) const
 {
     switch (vehicleType()) {
diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index 5803d26e601b61dc5dcf8b05b2be6f3ec8fc1045..06207e20a867edcd809f8d8bdf53452225b09706 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -276,6 +276,7 @@ public:
     Q_PROPERTY(bool                 vtol                    READ vtol                                                   CONSTANT)
     Q_PROPERTY(bool                 rover                   READ rover                                                  CONSTANT)
     Q_PROPERTY(bool                 supportsManualControl   READ supportsManualControl                                  CONSTANT)
+    Q_PROPERTY(bool                 sub                     READ sub                                                    CONSTANT)
     Q_PROPERTY(bool                 autoDisconnect          MEMBER _autoDisconnect                                      NOTIFY autoDisconnectChanged)
     Q_PROPERTY(QString              prearmError             READ prearmError            WRITE setPrearmError            NOTIFY prearmErrorChanged)
     Q_PROPERTY(int                  motorCount              READ motorCount                                             CONSTANT)
@@ -466,6 +467,7 @@ public:
     bool multiRotor(void) const;
     bool vtol(void) const;
     bool rover(void) const;
+    bool sub(void) const;
 
     bool supportsManualControl(void) const;