From 0c7ab73364067d43ddab3dcf3b61c0533c13e010 Mon Sep 17 00:00:00 2001
From: i-just <iwona@pixelandtonic.com>
Date: Mon, 27 Oct 2025 13:08:06 +0100
Subject: [PATCH] pass only existing elements to the elementSelectField

---
 src/templates/_includes/fields/_base.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/templates/_includes/fields/_base.html b/src/templates/_includes/fields/_base.html
index 189e850e..3b01c5c1 100644
--- a/src/templates/_includes/fields/_base.html
+++ b/src/templates/_includes/fields/_base.html
@@ -176,7 +176,10 @@
                             {% set elements = [] %}
 
                             {% for elementId in defaultValue %}
-                                {% set elements = elements|merge([ craft.app.elements.getElementById(elementId) ]) %}
+                                {% set element = craft.app.elements.getElementById(elementId) %}
+                                {% if element is not empty %}
+                                    {% set elements = elements|merge([element]) %}
+                                {% endif %}
                             {% endfor %}
 
                             {{ forms.elementSelectField({