diff --git a/src/GUI/mapview.cpp b/src/GUI/mapview.cpp
index 5ff9c2c0..be92a7ce 100644
--- a/src/GUI/mapview.cpp
+++ b/src/GUI/mapview.cpp
@@ -185,7 +185,7 @@ PathItem *MapView::addRoute(const Route &route)
 	ri->setVisible(_showRoutes);
 	ri->showWaypoints(_showRouteWaypoints);
 	ri->showWaypointLabels(_showWaypointLabels);
-	ri->showWaypointIcons(_showWaypointLabels);
+	ri->showWaypointIcons(_showWaypointIcons);
 	ri->setDigitalZoom(_digitalZoom);
 	ri->setMarkerColor(_markerColor);
 	ri->showMarker(_showMarkers);
diff --git a/src/GUI/waypointitem.cpp b/src/GUI/waypointitem.cpp
index 349836d8..8839438f 100644
--- a/src/GUI/waypointitem.cpp
+++ b/src/GUI/waypointitem.cpp
@@ -74,7 +74,7 @@ WaypointItem::WaypointItem(const Waypoint &waypoint, Map *map,
   QGraphicsItem *parent) : GraphicsItem(parent)
 {
 	_waypoint = waypoint;
-	_showLabel = true;
+	_showLabel = false;
 	_showIcon = false;
 	_size = 8;
 	_color = Qt::black;