diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java
index 5a9917b20e7..0a56a0c55e1 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java
@@ -84,8 +84,7 @@
  * @author Laurent Garnier - icon color support for all widgets
  * @author Laurent Garnier - Added support for new element Buttongrid
  * @author Laurent Garnier - Added icon field for mappings
- * @author Mark Herwege - Make UI provided sitemaps compatible with enhanced syntax, no full UI support for enhanced
- *         syntax
+ * @author Mark Herwege - Make UI provided sitemaps compatible with enhanced syntax in conditions
  */
 @NonNullByDefault
 @Component(service = SitemapProvider.class)
@@ -162,10 +161,9 @@ protected Sitemap buildSitemap(RootUIComponent rootComponent) {
         SitemapImpl sitemap = (SitemapImpl) SitemapFactory.eINSTANCE.createSitemap();
         sitemap.setName(SITEMAP_PREFIX + rootComponent.getUID());
         Object label = rootComponent.getConfig().get("label");
-        if (label == null) {
-            return sitemap;
+        if (label != null) {
+            sitemap.setLabel(label.toString());
         }
-        sitemap.setLabel(label.toString());
 
         if (rootComponent.getSlots() != null && rootComponent.getSlots().containsKey("widgets")) {
             for (UIComponent component : rootComponent.getSlot("widgets")) {