diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java
index fd1504d4da..bc7e3bd499 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java
@@ -27,10 +27,12 @@ package net.runelite.client.ui.overlay;
 import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.Rectangle;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import net.runelite.client.ui.overlay.components.LayoutableRenderableEntity;
 
-@Data
+@Getter
+@Setter
 public abstract class Overlay implements LayoutableRenderableEntity
 {
 	private Point preferredLocation;
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java
index 50f591e914..0f2f77d6e0 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java
@@ -109,6 +109,11 @@ public class OverlayManager
 	 */
 	public synchronized boolean add(final Overlay overlay)
 	{
+		if (overlays.contains(overlay))
+		{
+			return false;
+		}
+
 		final boolean add = overlays.add(overlay);
 
 		if (add)