diff --git a/src/Event/Listener/FieldFillListener.php b/src/Event/Listener/FieldFillListener.php
index cca651cdc..f32d12a67 100644
--- a/src/Event/Listener/FieldFillListener.php
+++ b/src/Event/Listener/FieldFillListener.php
@@ -45,11 +45,11 @@ public function postLoad(LifecycleEventArgs $args): void
     public function fillSet(SetField $entity): void
     {
         $definition = $entity->getDefinition();
-        $fields = $this->intersectFieldsAndDefinition($this->fields->findAllByParent($entity), $definition);
+        $fields = $this->fields->findAllByParent($entity);
 
         /** @var Field $field */
         foreach ($fields as $field) {
-            $definition = $entity->getDefinition()->get('fields')[$field->getName()] ?? new Collection();
+            $definition = $definition->get('fields')[$field->getName()] ?? new Collection();
             $field->setDefinition($field->getName(), $definition);
         }
 
diff --git a/templates/_partials/fields/image.html.twig b/templates/_partials/fields/image.html.twig
index 419d91377..1bc695e87 100644
--- a/templates/_partials/fields/image.html.twig
+++ b/templates/_partials/fields/image.html.twig
@@ -1,6 +1,6 @@
 {% extends '@bolt/_partials/fields/_base.html.twig' %}
 
-{% set extensions = field.definition.get('extensions')|default('') %}
+{% set extensions = field.definition.get('extensions')|default([]) %}
 {% set info %}
 {{ 'upload.allow_file_types'|trans }}: <code>{{ extensions|join('</code>, <code>') }}</code><br>
 {{ 'upload.max_size'|trans }}: {{ config.maxupload|format_bytes }}