diff --git a/libs/ui/include/psemek/ui/impl/component_factory_base.hpp b/libs/ui/include/psemek/ui/impl/component_factory_base.hpp
index bca99bab..33fecc72 100644
--- a/libs/ui/include/psemek/ui/impl/component_factory_base.hpp
+++ b/libs/ui/include/psemek/ui/impl/component_factory_base.hpp
@@ -132,7 +132,7 @@ namespace psemek::ui::impl
 										child_keys[i] = *key;
 									}
 
-									if (!children[i] && i < old_children.size() && old_children[i])
+									if (!children[i] && i < old_children.size() && old_children[i] && children_values[i].element)
 										children[i] = std::move(old_children[i]);
 								}