diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
index b6da44d76a..a53f6bac4e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
@@ -85,7 +85,7 @@ class LapCounterOverlay extends Overlay
 			.right(Integer.toString(session.getTotalLaps()))
 			.build());
 
-		if (session.getLapsTillLevel() > 0)
+		if (config.lapsToLevel() && session.getLapsTillLevel() > 0)
 		{
 			panelComponent.getChildren().add(LineComponent.builder()
 				.left("Laps until level:")
@@ -93,6 +93,14 @@ class LapCounterOverlay extends Overlay
 				.build());
 		}
 
+		if (config.lapsToGoal() && session.getLapsTillGoal() > 0)
+		{
+			panelComponent.getChildren().add(LineComponent.builder()
+				.left("Laps until goal:")
+				.right(Integer.toString(session.getLapsTillGoal()))
+				.build());
+		}
+
 		return panelComponent.render(graphics);
 	}
 }