diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
index 9826764be0..71ffe90946 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
@@ -233,7 +233,7 @@ public final class Parade extends AbstractNpcAI
 					}
 				}
 			}
-			if (spawns.size() == 0)
+			if ((spawns.size() == 0) && (deleteTask != null))
 			{
 				deleteTask.cancel(false);
 			}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
index 9826764be0..71ffe90946 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
@@ -233,7 +233,7 @@ public final class Parade extends AbstractNpcAI
 					}
 				}
 			}
-			if (spawns.size() == 0)
+			if ((spawns.size() == 0) && (deleteTask != null))
 			{
 				deleteTask.cancel(false);
 			}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
index 9826764be0..71ffe90946 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
@@ -233,7 +233,7 @@ public final class Parade extends AbstractNpcAI
 					}
 				}
 			}
-			if (spawns.size() == 0)
+			if ((spawns.size() == 0) && (deleteTask != null))
 			{
 				deleteTask.cancel(false);
 			}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
index 9826764be0..71ffe90946 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
@@ -233,7 +233,7 @@ public final class Parade extends AbstractNpcAI
 					}
 				}
 			}
-			if (spawns.size() == 0)
+			if ((spawns.size() == 0) && (deleteTask != null))
 			{
 				deleteTask.cancel(false);
 			}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
index 9826764be0..71ffe90946 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
@@ -233,7 +233,7 @@ public final class Parade extends AbstractNpcAI
 					}
 				}
 			}
-			if (spawns.size() == 0)
+			if ((spawns.size() == 0) && (deleteTask != null))
 			{
 				deleteTask.cancel(false);
 			}