diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
index fe36cce8f7..ce8f02472d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
@@ -1216,7 +1216,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 				{
 					if (temp.equalsIgnoreCase(Text.removeTags(entries[i].getTarget())))
 					{
-						if (entries[i].getType() == 3 || entries[i].getType() == 1002)
+						if (!entries[i].getOption().equalsIgnoreCase("remove"))
 						{
 							entries = ArrayUtils.remove(entries, i);
 							i--;
@@ -1224,6 +1224,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 					}
 				}
 			}
+
 			client.setMenuEntries(entries);
 		}
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
index 1bd6590af2..38cb016c63 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
@@ -106,7 +106,7 @@ public interface NpcAggroAreaConfig extends Config
 	}
 
 	@ConfigItem(
-		keyName = "npcUnaggroShowNotWorkingOverlay",
+		keyName = "hideOverlayHint",
 		name = "Hide overlay hint",
 		description = "Hide overlay hint if plugin is enabled in unsupported area",
 		position = 6