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 aaa84dd3e9854a967a951d72b4794108d3f073d1..c8ecfface70e208a0a02eff16cbf13985693e119 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
@@ -251,7 +251,7 @@ public class AdminQuest implements IAdminCommandHandler
 					}
 				}
 				
-				if (!npcs.isEmpty())
+				if (!events.isEmpty())
 				{
 					events = events.substring(2);
 				}
@@ -262,6 +262,10 @@ public class AdminQuest implements IAdminCommandHandler
 					{
 						npcs += ", " + npcId;
 					}
+				}
+				
+				if (!npcs.isEmpty())
+				{
 					npcs = npcs.substring(2);
 				}