diff --git a/src/FactSystem/FactControls/FactPanelController.cc b/src/FactSystem/FactControls/FactPanelController.cc
index 73dee24bc5792421b29672242eccde5ed7190495..62e0765245984dd2bb27b9919094a94af9227e53 100644
--- a/src/FactSystem/FactControls/FactPanelController.cc
+++ b/src/FactSystem/FactControls/FactPanelController.cc
@@ -61,6 +61,10 @@ void FactPanelController::_notifyPanelErrorMsg(const QString& errorMsg)
 
 void FactPanelController::_reportMissingParameter(int componentId, const QString& name)
 {
+    if (componentId == FactSystem::defaultComponentId) {
+        componentId = _vehicle->defaultComponentId();
+    }
+
     qgcApp()->reportMissingParameter(componentId, name);
 
     QString missingParam = QString("%1:%2").arg(componentId).arg(name);