diff --git a/ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg b/ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
index 42fdf22ac..8ebee3cc8 100644
--- a/ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
+++ b/ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
@@ -30,7 +30,7 @@
      inkscape:zoom="6.5977991"
      inkscape:cx="55.083588"
      inkscape:cy="24.071773"
-     inkscape:current-layer="layer45"
+     inkscape:current-layer="layer46"
      id="namedview3608"
      showgrid="true"
      inkscape:window-width="1280"
@@ -1685,6 +1685,20 @@
        ry="0.98050147"
        inkscape:label="#rect4550-8-1-4-21-1" />
   </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer46"
+     inkscape:label="SystemConfiguration-BadThrottleOrCollectiveInputRange">
+    <rect
+       style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
+       id="SystemConfiguration-BadThrottleOrCollectiveInputRange"
+       width="13.110236"
+       height="10.107105"
+       x="80.806435"
+       y="51.972187"
+       ry="0.98050147"
+       inkscape:label="#rect4550-8-1-4-21-1" />
+  </g>
   <g
      inkscape:groupmode="layer"
      id="layer43"
@@ -3024,7 +3038,7 @@
            sodipodi:cy="35.07505"
            sodipodi:rx="0.5"
            sodipodi:ry="0.5"
-           d="M 14,35.07505 A 0.5,0.5 0 1 1 13.999725,35.058469"
+           d="M 14,35.07505 C 14,35.351193 13.776142,35.57505 13.5,35.57505 C 13.223858,35.57505 13,35.351193 13,35.07505 C 13,34.798908 13.223858,34.57505 13.5,34.57505 C 13.769688,34.57505 13.990781,34.78893 13.999725,35.058469"
            sodipodi:start="0"
            sodipodi:end="6.2500167"
            sodipodi:open="true"
@@ -3057,7 +3071,7 @@
            sodipodi:cy="35.07505"
            sodipodi:rx="0.5"
            sodipodi:ry="0.5"
-           d="M 14,35.07505 A 0.5,0.5 0 1 1 13.999725,35.058469"
+           d="M 14,35.07505 C 14,35.351193 13.776142,35.57505 13.5,35.57505 C 13.223858,35.57505 13,35.351193 13,35.07505 C 13,34.798908 13.223858,34.57505 13.5,34.57505 C 13.769688,34.57505 13.990781,34.78893 13.999725,35.058469"
            sodipodi:start="0"
            sodipodi:end="6.2500167"
            sodipodi:open="true"
diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
index e21cebbbe..2acce4183 100644
--- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
@@ -1676,8 +1676,9 @@ void ConfigInputWidget::adjustSpecialNeutrals()
 
 void ConfigInputWidget::checkThrottleRange()
 {
-    if ((abs(manualSettingsData.ChannelMax[ManualControlSettings::CHANNELMAX_THROTTLE] -
-             manualSettingsData.ChannelMin[ManualControlSettings::CHANNELMIN_THROTTLE]) < 300) && (throttleError == false)) {
+    int throttleRange = abs(manualSettingsData.ChannelMax[ManualControlSettings::CHANNELMAX_THROTTLE] -
+             manualSettingsData.ChannelMin[ManualControlSettings::CHANNELMIN_THROTTLE]);
+    if (!throttleError && (throttleRange < 300)) {
         throttleError = true;
         QMessageBox::warning(this, tr("Warning"), tr("<p>There is something wrong with Throttle range. Please redo calibration and move <b>ALL sticks</b>, Throttle stick included.</p>"), QMessageBox::Ok);
 
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/fr/SystemConfiguration-BadThrottleOrCollectiveInputRange.html b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/SystemConfiguration-BadThrottleOrCollectiveInputRange.html
new file mode 100644
index 000000000..4bd3738ed
--- /dev/null
+++ b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/SystemConfiguration-BadThrottleOrCollectiveInputRange.html
@@ -0,0 +1,17 @@
+<html>
+  <head>
+    <title></title>
+    <meta content="">
+    <style></style>
+  </head>
+  <body>
+    <h1>Configuration Système : BadThrottleOrCollectiveInputRange</h1>
+    <p>
+    Il y a un problème avec la configuration du canal throttle/collective :
+    <ul>
+     <li>Relancez la calibration des entrées.</li>
+     <li>La différence entre la valeur mini et maxi doit faire au moins 300µs.</li>
+    </ul>
+   </p>
+  </body>
+</html>
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/systemhealth.qrc b/ground/openpilotgcs/src/plugins/systemhealth/systemhealth.qrc
index cd71d368d..64f21cdd2 100644
--- a/ground/openpilotgcs/src/plugins/systemhealth/systemhealth.qrc
+++ b/ground/openpilotgcs/src/plugins/systemhealth/systemhealth.qrc
@@ -33,6 +33,7 @@
         <file>html/Stabilization-Critical.html</file>
         <file>html/SystemConfiguration-UnsupportedConfig_OneShot.html</file>
         <file>html/SystemConfiguration-FlightMode.html</file>
+        <file>html/SystemConfiguration-BadThrottleOrCollectiveInputRange.html</file>
         <file>html/BootFault-RebootRequired.html</file>
     </qresource>
     <qresource prefix="/systemhealth" lang="fr">
@@ -69,6 +70,7 @@
         <file alias="html/Stabilization-Critical.html">html/fr/Stabilization-Critical.html</file>
         <file alias="html/SystemConfiguration-UnsupportedConfig_OneShot.html">html/fr/SystemConfiguration-UnsupportedConfig_OneShot.html</file>
         <file alias="html/SystemConfiguration-FlightMode.html">html/fr/SystemConfiguration-FlightMode.html</file>
+        <file alias="html/SystemConfiguration-BadThrottleOrCollectiveInputRange.html">html/fr/SystemConfiguration-BadThrottleOrCollectiveInputRange.html</file>
         <file alias="html/BootFault-RebootRequired.html">html/fr/BootFault-RebootRequired.html</file>
 </qresource>
 
