diff --git a/src/ui/map/Waypoint2DIcon.cc b/src/ui/map/Waypoint2DIcon.cc
index 3bf5423..83aad5b 100644
--- a/src/ui/map/Waypoint2DIcon.cc
+++ b/src/ui/map/Waypoint2DIcon.cc
@@ -291,10 +291,12 @@ void Waypoint2DIcon::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
         redPen.setWidth(1);
         painter->setPen(redPen);
         const int acceptance = map->metersToPixels(waypoint->getAcceptanceRadius(), Coord());
-        painter->setPen(penBlack);
-        painter->drawEllipse(QPointF(0, 0), acceptance, acceptance);
-        painter->setPen(redPen);
-        painter->drawEllipse(QPointF(0, 0), acceptance, acceptance);
+        if (acceptance > 0) {
+            painter->setPen(penBlack);
+            painter->drawEllipse(QPointF(0, 0), acceptance, acceptance);
+            painter->setPen(redPen);
+            painter->drawEllipse(QPointF(0, 0), acceptance, acceptance);
+        }
     }
     if ((waypoint) && ((waypoint->getAction() == (int)MAV_CMD_NAV_LOITER_UNLIM) || (waypoint->getAction() == (int)MAV_CMD_NAV_LOITER_TIME) || (waypoint->getAction() == (int)MAV_CMD_NAV_LOITER_TURNS)))
     {