diff --git a/tools/exporters/data_dictionary_builder.php b/tools/exporters/data_dictionary_builder.php
index 8ffaab279f2..ade314778a0 100755
--- a/tools/exporters/data_dictionary_builder.php
+++ b/tools/exporters/data_dictionary_builder.php
@@ -51,9 +51,12 @@
 $instrumentParameterTypeCategoryIDs = [];
 $instrumentParameterTypeIDs         = [];
 
-
 $parameter_types = $DB->pselectColWithIndexKey(
-    "Select Name, ParameterTypeID from parameter_type",
+    "SELECT pt.Name, pt.ParameterTypeID
+    FROM parameter_type pt
+        JOIN parameter_type_category_rel ptcr USING (ParameterTypeID)
+        JOIN parameter_type_category ptc USING (ParameterTypeCategoryID)
+    WHERE ptc.Type = 'Instrument'",
     [],
     "Name"
 );