diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java
index 12d2e5cc80..035433e280 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java
@@ -52,16 +52,7 @@ public class WhaleWatchersGloryOverlay extends Overlay
 	public Dimension render(Graphics2D graphics)
 	{
 		panelComponent.getChildren().clear();
-		int amuletID = 0;
-		try
-		{
-			amuletID = client.getLocalPlayer().getPlayerComposition().getEquipmentId(KitType.AMULET);
-		}
-		catch (NullPointerException e)
-		{
-
-		}
-		if (config.gloryWarning() && amuletID == ItemID.AMULET_OF_GLORY)
+		if (plugin.isDisplayGloryOverlay())
 		{
 			panelComponent.setBackgroundColor(Color.lightGray);
 			final AsyncBufferedImage gloryImage = itemManager.getImage(ItemID.AMULET_OF_GLORY);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java
index cdbc5a2e70..2e23972b9a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java
@@ -142,7 +142,7 @@ public class WhaleWatchersPlugin extends Plugin
 	@Subscribe
 	public void onItemContainerChanged(ItemContainerChanged event)
 	{
-		if (config.gloryWarning() && event.getItemContainer().equals(InventoryID.EQUIPMENT))
+		if (config.gloryWarning() && event.getItemContainer() == client.getItemContainer(InventoryID.EQUIPMENT))
 		{
 			final int amuletID = ObjectUtils.defaultIfNull(client.getLocalPlayer()
 				.getPlayerComposition().getEquipmentId(KitType.AMULET), 0);