diff --git a/gradle.properties b/gradle.properties
index acc43c7..2404a3b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -34,7 +34,7 @@ mod_name=Sign Me Up
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=BSD-3-Clause
 # The mod version. See https://semver.org/
-mod_version=0.6.20
+mod_version=0.6.21
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
diff --git a/src/main/java/org/teacon/signmeup/gui/map/WayPointsPanel.java b/src/main/java/org/teacon/signmeup/gui/map/WayPointsPanel.java
index 9b58b5f..d587045 100644
--- a/src/main/java/org/teacon/signmeup/gui/map/WayPointsPanel.java
+++ b/src/main/java/org/teacon/signmeup/gui/map/WayPointsPanel.java
@@ -188,6 +188,15 @@ public static final class MultiVisualWaypoint extends VisualWaypoint {
         public MultiVisualWaypoint(MapPanel.InnerMapPanel map, Set<Waypoint> waypoints) {
             super(IMAGE);
             this.waypoints = waypoints;
+            int count = waypoints.size();
+            double x = 0D, z = 0D;
+            for (Waypoint waypoint : waypoints) {
+                x += waypoint.pos().x;
+                z += waypoint.pos().z;
+            }
+            Vector2i pos = map.worldToGui(x / count, z / count);
+            pos.sub(DOT_SIZE / 2, DOT_SIZE / 2);
+            setAbsBounds(pos.x, pos.y, DOT_SIZE, DOT_SIZE);
             setTooltip(Tooltip.create(Component.literal(waypoints.stream().map(Waypoint::name).collect(Collectors.joining("\n")))));
         }