diff --git a/nest/rt-table.c b/nest/rt-table.c
index 97a5d1bc..d99953e5 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2137,6 +2137,8 @@ no_nexthop:
       nhp->gw = nh->gw;			/* Router nexthop */
       nhp->flags |= (nh->flags & RNF_ONLINK);
     }
+    else if (!(nh->iface->flags & IF_MULTIACCESS) || (nh->iface->flags & IF_LOOPBACK))
+      nhp->gw = IPA_NONE;		/* PtP link - no need for nexthop */
     else if (ipa_nonzero(he->link))
       nhp->gw = he->link;		/* Device nexthop with link-local address known */
     else