diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java
index e850169cbf..8a55f1fc21 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java
@@ -102,12 +102,9 @@ public class LizardmenShamanPlugin extends Plugin
 	@Subscribe
 	public void onChatMessage(ChatMessage event)
 	{
-		if (this.notifyOnSpawn)
+		if (this.notifyOnSpawn && event.getMessage().contains(MESSAGE))
 		{
-			if (event.getMessage().contains(MESSAGE))
-			{
-				notifier.notify(MESSAGE);
-			}
+			notifier.notify(MESSAGE);
 		}
 	}
 
@@ -120,12 +117,9 @@ public class LizardmenShamanPlugin extends Plugin
 			return;
 		}
 
-		if (actor.getName().equals(SHAMAN) && actor.getAnimation() == 7157)
+		if (actor.getName().equals(SHAMAN) && actor.getAnimation() == 7157 && this.showTimer)
 		{
-			if (this.showTimer)
-			{
-				spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null));
-			}
+			spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null));
 		}
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java
index 9d60355d6d..2ccc721ddf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java
@@ -63,12 +63,9 @@ class ShamanSpawnOverlay extends Overlay
 			final long startCountdown = Duration.between(spawn.getStart(), now).getSeconds();
 			final double certainSec = spawn.getCountdownTimer() - startCountdown;
 
-			if (certainSec <= 0)
+			if (certainSec <= 0 && spawn.getEnd() == null)
 			{
-				if (spawn.getEnd() == null)
-				{
-					spawn.setEnd(Instant.now());
-				}
+				spawn.setEnd(Instant.now());
 			}
 
 			final ProgressPieComponent pieComponent = new ProgressPieComponent();