diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java
index 4d6550fe8b..c6a010ab7d 100644
--- a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java
+++ b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java
@@ -115,7 +115,7 @@ public class L2FishingZone extends L2ZoneType
 		@Override
 		public void run()
 		{
-			if (!player.isFishing())
+			if (Config.ALLOWFISHING && !player.isFishing() && !player.isInsideZone(ZoneId.WATER) && !player.isInBoat() && !player.isInCraftMode() && !player.isInStoreMode())
 			{
 				player.sendPacket(new ExAutoFishAvailable(player));
 			}