diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 3594b17..39525d5 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -417,7 +417,6 @@
       api.message = 0;
       api.ifindex_num = 0;
       api.nexthop_num = 0;
-      SET_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP);
 
       for (node = listhead (or->paths); node; nextnode (node))
         {
@@ -425,17 +424,11 @@
 
           if (path->nexthop.s_addr != INADDR_ANY)
             {
+              SET_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP);
               api.nexthop_num = 1;
               nexthop = &path->nexthop;
               api.nexthop = &nexthop;
             }
-          else
-            {
-              /* Commented out by Hasso because it introduces segfault.
-               * See bug #29 in bugzilla for details. */
-              /* api.ifindex_num = 1;
-                 api.ifindex = &path->oi->ifp->ifindex; */
-            }
 
           zapi_ipv4_delete (zclient, p, &api);