diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Stun.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Stun.java
index 0a274a4f3d..7d02c7ff75 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Stun.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Stun.java
@@ -78,6 +78,11 @@ public class Stun extends AbstractEffect
 	@Override
 	public void onStart(BuffInfo info)
 	{
+		final Creature effected = info.getEffected();
+		if ((effected == null) || effected.isRaid())
+		{
+			return;
+		}
 		info.getEffected().startStunning();
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java
index 0a274a4f3d..7d02c7ff75 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java
@@ -78,6 +78,11 @@ public class Stun extends AbstractEffect
 	@Override
 	public void onStart(BuffInfo info)
 	{
+		final Creature effected = info.getEffected();
+		if ((effected == null) || effected.isRaid())
+		{
+			return;
+		}
 		info.getEffected().startStunning();
 	}
 }