diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 21db59f06c877bab187709e3dcf83bec3035f8cc..aaa84dd3e9854a967a951d72b4794108d3f073d1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -243,11 +243,18 @@ public class AdminQuest implements IAdminCommandHandler
 				msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/npc-quests.htm");
 				String events = "", npcs = "", items = "", timers = "";
 				
-				for (QuestEventType type : npc.getTemplate().getEventQuests().keySet())
+				for (Entry<QuestEventType, List<Quest>> entry : npc.getTemplate().getEventQuests().entrySet())
 				{
-					events += ", " + type.toString();
+					if (entry.getValue().contains(quest))
+					{
+						events += ", " + entry.getKey().name();
+					}
+				}
+				
+				if (!npcs.isEmpty())
+				{
+					events = events.substring(2);
 				}
-				events = events.substring(2);
 				
 				if (quest.getQuestInvolvedNpcs().size() < 100)
 				{