diff --git a/app/javascript/dashboard/components-next/ConversationWorkflow/AttributeListItem.vue b/app/javascript/dashboard/components-next/ConversationWorkflow/AttributeListItem.vue
index c91352dcd..12c6ce9bc 100644
--- a/app/javascript/dashboard/components-next/ConversationWorkflow/AttributeListItem.vue
+++ b/app/javascript/dashboard/components-next/ConversationWorkflow/AttributeListItem.vue
@@ -52,10 +52,8 @@ const attributeIcon = computed(() => {
       <div class="flex gap-2 items-center">
         <AttributeBadge
           v-for="badge in badges"
-          :key="badge.label || badge"
-          :label="badge.label || badge"
-          :icon="badge.icon"
-          :color="badge.color"
+          :key="badge.label"
+          :type="badge.type"
         />
         <div class="w-px h-3 bg-n-strong" />
         <Button
diff --git a/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue
index 842222c98..6b0438c46 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue
@@ -8,12 +8,19 @@ import Button from 'dashboard/components-next/button/Button.vue';
 import TabBar from 'dashboard/components-next/tabbar/TabBar.vue';
 import AttributeListItem from 'dashboard/components-next/ConversationWorkflow/AttributeListItem.vue';
 import { useI18n } from 'vue-i18n';
-import { useStoreGetters, useStore } from 'dashboard/composables/store';
+import {
+  useStoreGetters,
+  useStore,
+  useMapGetter,
+} from 'dashboard/composables/store';
+import { useAccount } from 'dashboard/composables/useAccount';
 
 const { t } = useI18n();
 
 const getters = useStoreGetters();
 const store = useStore();
+const { currentAccount } = useAccount();
+const inboxes = useMapGetter('inboxes/getInboxes');
 
 const showAddPopup = ref(false);
 const selectedTabIndex = ref(0);
@@ -76,9 +83,49 @@ const handleDeleteAttribute = attribute => {
   showDeletePopup.value = true;
 };
 
-const badges = computed(() => {
-  return ['pre-chat', 'resolution'];
-});
+const requiredAttributeKeys = computed(
+  () => currentAccount.value?.settings?.conversation_required_attributes || []
+);
+
+const hasPreChatBadge = attribute => {
+  return (inboxes.value || []).some(inbox => {
+    const fields =
+      inbox?.pre_chat_form_options?.pre_chat_fields ||
+      inbox?.channel?.pre_chat_form_options?.pre_chat_fields ||
+      [];
+    return fields.some(field => field.name === attribute.attribute_key);
+  });
+};
+
+const buildBadges = attribute => {
+  const badges = [];
+  if (hasPreChatBadge(attribute)) {
+    badges.push({
+      type: 'pre-chat',
+    });
+  }
+
+  if (
+    attribute.attribute_model === 'conversation_attribute' &&
+    requiredAttributeKeys.value.includes(attribute.attribute_key)
+  ) {
+    badges.push({
+      type: 'resolution',
+    });
+  }
+
+  return badges;
+};
+
+const derivedAttributes = computed(() =>
+  attributes.value.map(attribute => ({
+    ...attribute,
+    label: attribute.attribute_display_name,
+    type: attribute.attribute_display_type,
+    value: attribute.attribute_key,
+    badges: buildBadges(attribute),
+  }))
+);
 </script>
 
 <template>
@@ -114,15 +161,10 @@ const badges = computed(() => {
         />
         <div class="grid gap-3">
           <AttributeListItem
-            v-for="attribute in attributes"
+            v-for="attribute in derivedAttributes"
             :key="attribute.id"
-            :attribute="{
-              ...attribute,
-              label: attribute.attribute_display_name,
-              type: attribute.attribute_display_type,
-              value: attribute.attribute_key,
-            }"
-            :badges="badges"
+            :attribute="attribute"
+            :badges="attribute.badges"
             @edit="handleEditAttribute"
             @delete="handleDeleteAttribute"
           />