diff --git a/src/backend/InvenTree/InvenTree/models.py b/src/backend/InvenTree/InvenTree/models.py
index 4c1f192972..703629120b 100644
--- a/src/backend/InvenTree/InvenTree/models.py
+++ b/src/backend/InvenTree/InvenTree/models.py
@@ -605,7 +605,11 @@ class InvenTreeParameterMixin(InvenTreePermissionCheckMixin, models.Model):
 
     def get_parameters(self) -> QuerySet:
         """Return all Parameter instances for this model."""
-        return self.parameters_list.all().order_by('template__name')
+        return (
+            self.parameters_list.all()
+            .prefetch_related('template', 'model_type')
+            .order_by('template__name')
+        )
 
     def parameters_map(self) -> dict:
         """Return a map (dict) of parameter values associated with this Part instance, of the form.
diff --git a/src/backend/InvenTree/common/test_api.py b/src/backend/InvenTree/common/test_api.py
index 885f590a83..73e0262750 100644
--- a/src/backend/InvenTree/common/test_api.py
+++ b/src/backend/InvenTree/common/test_api.py
@@ -225,8 +225,8 @@ class ParameterAPITests(InvenTreeAPITestCase):
         common.models.ParameterTemplate.objects.bulk_create(templates)
 
         # Create a parameter for every company against every template
-        for company in companies:
-            for template in templates:
+        for company in Company.objects.all():
+            for template in common.models.ParameterTemplate.objects.all():
                 parameters.append(
                     common.models.Parameter(
                         template=template,