diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
index a145d357a8..39cbb4253e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
@@ -217,7 +217,7 @@ public class FishingPlugin extends Plugin
 		}
 
 		final NPC npc = (NPC) target;
-		FishingSpot spot = FishingSpot.getSPOTS().get(npc.getId());
+		FishingSpot spot = FishingSpot.findSpot(npc.getId());
 
 		if (spot == null)
 		{
@@ -289,7 +289,7 @@ public class FishingPlugin extends Plugin
 
 		for (NPC npc : fishingSpots)
 		{
-			if (FishingSpot.getSPOTS().get(npc.getId()) == FishingSpot.MINNOW && config.showMinnowOverlay())
+			if (FishingSpot.findSpot(npc.getId()) == FishingSpot.MINNOW && config.showMinnowOverlay())
 			{
 				final int id = npc.getIndex();
 				final MinnowSpot minnowSpot = minnowSpots.get(id);
@@ -315,7 +315,7 @@ public class FishingPlugin extends Plugin
 	{
 		final NPC npc = event.getNpc();
 
-		if (!FishingSpot.getSPOTS().containsKey(npc.getId()))
+		if (FishingSpot.findSpot(npc.getId()) == null)
 		{
 			return;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java
index a26c216ad0..0a5242178c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java
@@ -172,7 +172,6 @@ enum FishingSpot
 	COMMON_TENCH("Common tench, Bluegill, Greater siren, Mottled eel", ItemID.COMMON_TENCH,
 		FISHING_SPOT_8523);
 
-	@Getter
 	private static final Map<Integer, FishingSpot> SPOTS;
 
 	private final String name;
@@ -200,4 +199,9 @@ enum FishingSpot
 		this.fishSpriteId = fishSpriteId;
 		this.ids = ids;
 	}
+
+	static FishingSpot findSpot(int id)
+	{
+		return SPOTS.get(id);
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
index fd01d32acc..09a6b612fc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
@@ -64,7 +64,7 @@ class FishingSpotMinimapOverlay extends Overlay
 
 		for (NPC npc : plugin.getFishingSpots())
 		{
-			FishingSpot spot = FishingSpot.getSPOTS().get(npc.getId());
+			FishingSpot spot = FishingSpot.findSpot(npc.getId());
 
 			if (spot == null)
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
index 5c4b6b0d21..257955c878 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
@@ -86,7 +86,7 @@ class FishingSpotOverlay extends Overlay
 		WorldPoint previousLocation = null;
 		for (NPC npc : plugin.getFishingSpots())
 		{
-			FishingSpot spot = FishingSpot.getSPOTS().get(npc.getId());
+			FishingSpot spot = FishingSpot.findSpot(npc.getId());
 
 			if (spot == null)
 			{