diff --git a/dream/platform/src/fieldset/fieldset.js b/dream/platform/src/fieldset/fieldset.js
index 91936727d894885ae94ceb9c181ffd81c6a5d8a7..aef8ff1899e52f2e5e4541102331aa02745c4b6d 100644
--- a/dream/platform/src/fieldset/fieldset.js
+++ b/dream/platform/src/fieldset/fieldset.js
@@ -41,7 +41,9 @@
               })
             );
             // use expandable field if we have a oneOf in the schema
-            if (property_definition.oneOf) {
+            if (property_definition.oneOf &&
+                property_definition.properties &&
+                property_definition.properties.length === 1) {
               property_definition = {
                 allOf: [{properties: property_definition.properties},
                         { oneOf: property_definition.oneOf} ] };