diff --git a/src/FirmwarePlugin/APM/APMParameterMetaData.cc b/src/FirmwarePlugin/APM/APMParameterMetaData.cc
index 1b929d739bda7a96ccf134ff48485ffb71f4b709..2ab725937a32a467e74f34dedd4cce0d47af0312 100644
--- a/src/FirmwarePlugin/APM/APMParameterMetaData.cc
+++ b/src/FirmwarePlugin/APM/APMParameterMetaData.cc
@@ -97,6 +97,8 @@ void APMParameterMetaData::_loadParameterFactMetaData(void)
 /// Override from FactLoad which connects the meta data to the fact
 void APMParameterMetaData::addMetaDataToFact(Fact* fact)
 {
+    _loadParameterFactMetaData();
+
     // FIXME: Will need to switch here based on _vehicle->firmwareType() to pull right set of meta data
 
     FactMetaData* metaData = new FactMetaData(fact->type(), fact);
diff --git a/src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc b/src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc
index 9e370fc3891dcda3333e2c7b1f739f991fc3ce3e..ce4ddf090b2d11081d4f5e042f195856bf9bcfe8 100644
--- a/src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc
+++ b/src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc
@@ -347,6 +347,7 @@ void PX4ParameterMetaData::_loadParameterFactMetaData(void)
 /// Override from FactLoad which connects the meta data to the fact
 void PX4ParameterMetaData::addMetaDataToFact(Fact* fact)
 {
+    _loadParameterFactMetaData();
     if (_mapParameterName2FactMetaData.contains(fact->name())) {
         fact->setMetaData(_mapParameterName2FactMetaData[fact->name()]);
     } else {