diff --git a/bundles/org.openhab.ui/web/src/components/widgets/standard/list/default-list-item.js b/bundles/org.openhab.ui/web/src/components/widgets/standard/list/default-list-item.js
index 30198014f..3529b3139 100644
--- a/bundles/org.openhab.ui/web/src/components/widgets/standard/list/default-list-item.js
+++ b/bundles/org.openhab.ui/web/src/components/widgets/standard/list/default-list-item.js
@@ -105,9 +105,6 @@ export default function itemDefaultListComponent (item, footer) {
     if (text) component.config.footer = text
   }
   if (!item.category) component.config.fallbackIconToInitial = true
-  if (component.component === 'oh-label-item' && item.type.indexOf('Group') === 0 && !item.groupType && component.config.after === undefined) {
-    component.config.after = null // Hide 'NULL' label for standard (non-typed) groups with no 'after' metadata defined
-  }
   return component
 }
 
diff --git a/bundles/org.openhab.ui/web/src/components/widgets/standard/list/oh-label-item.vue b/bundles/org.openhab.ui/web/src/components/widgets/standard/list/oh-label-item.vue
index 6f9826439..60aee5fd0 100644
--- a/bundles/org.openhab.ui/web/src/components/widgets/standard/list/oh-label-item.vue
+++ b/bundles/org.openhab.ui/web/src/components/widgets/standard/list/oh-label-item.vue
@@ -1,6 +1,6 @@
 <template>
   <oh-list-item :context="context">
-    <div slot="after" v-if="config.after === undefined">
+    <div slot="after" v-if="(config.after === undefined) && (context.store[config.item].state !== 'NULL')">
       {{ context.store[config.item].displayState || context.store[config.item].state }}
     </div>
   </oh-list-item>