diff --git a/Assets/_/Features/UI/Runtime/Quests/QuestsBoardPanel.cs b/Assets/_/Features/UI/Runtime/Quests/QuestsBoardPanel.cs
index df691f08..286ac4e6 100644
--- a/Assets/_/Features/UI/Runtime/Quests/QuestsBoardPanel.cs
+++ b/Assets/_/Features/UI/Runtime/Quests/QuestsBoardPanel.cs
@@ -91,7 +91,16 @@ namespace GameUI.Runtime
         {
             GameObject GO = Instantiate(_questCardPrefab, _panel.transform);
             QuestCardUI card = GO.GetComponent<QuestCardUI>();
-            card.Setup(quest.ToQuestClass(QuestStateEnum.Disponible));
+            // Use the template's asset GUID as the quest ID so we can track acceptance/completion by template
+            if (System.Guid.TryParse(quest.m_assetGuid, out var templateGuid))
+            {
+                card.Setup(quest.ToQuestClass(QuestStateEnum.Disponible, templateGuid));
+            }
+            else
+            {
+                // Fallback: generate a new quest with a random ID
+                card.Setup(quest.ToQuestClass(QuestStateEnum.Disponible));
+            }
         }
         
         #endregion