diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php
index 59605162dbc48e7227f89d651d4753340057cad4..58f326c5507428efe6f123d3baecabdf966d7d73 100644
--- a/include/class.dynamic_forms.php
+++ b/include/class.dynamic_forms.php
@@ -1132,10 +1132,13 @@ class SelectionField extends FormField {
     }
 
     function hasSubFields() {
-        return true;
+        return $this->getList()->getForm();
     }
     function getSubFields() {
-        return $this->getConfigurationForm()->getFields();
+        $form = $this->getList()->getForm();
+        if ($form)
+            return $form->getFields();
+        return array();
     }
 
     function toString($items) {