diff --git a/core/net/ip/tcpip.c b/core/net/ip/tcpip.c
index 495b855cb..9bf144dc9 100644
--- a/core/net/ip/tcpip.c
+++ b/core/net/ip/tcpip.c
@@ -660,7 +660,11 @@ tcpip_ipv6_output(void)
 
         stimer_set(&nbr->sendns, uip_ds6_if.retrans_timer / 1000);
         nbr->nscount = 1;
+        /* Send the first NS try from here (multicast destination IP address). */
       }
+#else /* UIP_ND6_SEND_NA */
+      uip_len = 0;
+      return;  
 #endif /* UIP_ND6_SEND_NA */
     } else {
 #if UIP_ND6_SEND_NA
@@ -707,7 +711,6 @@ tcpip_ipv6_output(void)
       uip_clear_buf();
       return;
     }
-    return;
   }
   /* Multicast IP destination address. */
   tcpip_output(NULL);