diff --git a/src/FirmwarePlugin/FirmwarePlugin.h b/src/FirmwarePlugin/FirmwarePlugin.h
index 735294e462976510622e04eb3e6f9ced970ca230..3bddb14b91df968a04fb83e2c38a88acb1c82ee8 100644
--- a/src/FirmwarePlugin/FirmwarePlugin.h
+++ b/src/FirmwarePlugin/FirmwarePlugin.h
@@ -48,7 +48,7 @@ public:
         GuidedModeCapability =              1 << 2, ///< Vehicle supports guided mode commands
         OrbitModeCapability =               1 << 3, ///< Vehicle supports orbit mode
         TakeoffVehicleCapability =          1 << 4, ///< Vehicle supports guided takeoff
-        ROIModeCapability =                 1 << 5, ///< Vehicle supports ROI
+        ROIModeCapability =                 1 << 5, ///< Vehicle supports ROI (both in Fly guided mode and from Plan creation)
     } FirmwareCapabilities;
 
     /// Maps from on parameter name to another
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index 4388433f7a35a4d473198638cda32ccd1b6e8dce..e1457162eecced075fed9a7299dda163c7dfe600 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -617,7 +617,7 @@ Item {
                     name:               _missionController.isROIActive ? qsTr("Cancel ROI") : qsTr("ROI"),
                     iconSource:         "/qmlimages/MapAddMission.svg",
                     buttonEnabled:      true,
-                    buttonVisible:      _isMissionLayer,
+                    buttonVisible:      _isMissionLayer && _planMasterController.controllerVehicle.roiModeSupported,
                     toggle:             !_missionController.isROIActive
                 },
                 {