diff --git a/core/net/uip-ds6.c b/core/net/uip-ds6.c
index 644e49e00..49b7be5d3 100644
--- a/core/net/uip-ds6.c
+++ b/core/net/uip-ds6.c
@@ -204,6 +204,15 @@ uip_ds6_periodic(void)
       locnbr++) {
     if(locnbr->isused) {
       switch(locnbr->state) {
+      case NBR_REACHABLE:
+        if(stimer_expired(&locnbr->reachable)) {
+          PRINTF("REACHABLE: moving to STALE (");
+          PRINT6ADDR(&locnbr->ipaddr);
+          PRINTF(")\n");
+          locnbr->state = NBR_STALE;
+        }
+        break;
+#if UIP_ND6_SEND_NA
       case NBR_INCOMPLETE:
         if(locnbr->nscount >= UIP_ND6_MAX_MULTICAST_SOLICIT) {
           uip_ds6_nbr_rm(locnbr);
@@ -214,14 +223,6 @@ uip_ds6_periodic(void)
           stimer_set(&locnbr->sendns, uip_ds6_if.retrans_timer / 1000);
         }
         break;
-      case NBR_REACHABLE:
-        if(stimer_expired(&locnbr->reachable)) {
-          PRINTF("REACHABLE: moving to STALE (");
-          PRINT6ADDR(&locnbr->ipaddr);
-          PRINTF(")\n");
-          locnbr->state = NBR_STALE;
-        }
-        break;
       case NBR_DELAY:
         if(stimer_expired(&locnbr->reachable)) {
           locnbr->state = NBR_PROBE;
@@ -246,6 +247,7 @@ uip_ds6_periodic(void)
           stimer_set(&locnbr->sendns, uip_ds6_if.retrans_timer / 1000);
         }
         break;
+#endif /* UIP_ND6_SEND_NA */
       default:
         break;
       }