diff --git a/sys/net/gnrc/application_layer/tftp/gnrc_tftp.c b/sys/net/gnrc/application_layer/tftp/gnrc_tftp.c
index 6cf78233dbfad72ef75a6df203c93408638049e4..0c952e73feaf816cd143779c0d84fccae33955f9 100644
--- a/sys/net/gnrc/application_layer/tftp/gnrc_tftp.c
+++ b/sys/net/gnrc/application_layer/tftp/gnrc_tftp.c
@@ -367,7 +367,7 @@ int _tftp_init_ctxt(ipv6_addr_t *addr, const char *file_name,
     /* generate a random source UDP source port */
     do {
         ctxt->src_port = (random_uint32() & 0xff) + GNRC_TFTP_DEFAULT_SRC_PORT;
-    } while (gnrc_netreg_num(GNRC_NETTYPE_UDP, ctxt->src_port));
+    } while (gnrc_netreg_lookup(GNRC_NETTYPE_UDP, ctxt->src_port));
 
     return TS_FINISHED;
 }
diff --git a/sys/net/gnrc/netapi/gnrc_netapi.c b/sys/net/gnrc/netapi/gnrc_netapi.c
index 9d7fbee96ee7b232fe20a900f0db8883e4d9a4cc..afe5998813ad613e5b72dd0a009a68d45cbd2fb2 100644
--- a/sys/net/gnrc/netapi/gnrc_netapi.c
+++ b/sys/net/gnrc/netapi/gnrc_netapi.c
@@ -94,54 +94,52 @@ static inline int _snd_rcv_mbox(mbox_t *mbox, uint16_t type, gnrc_pktsnip_t *pkt
 int gnrc_netapi_dispatch(gnrc_nettype_t type, uint32_t demux_ctx,
                          uint16_t cmd, gnrc_pktsnip_t *pkt)
 {
-    int numof = gnrc_netreg_num(type, demux_ctx);
+    int numof = 0;
+    gnrc_netreg_entry_t *sendto = gnrc_netreg_lookup(type, demux_ctx);
 
-    if (numof != 0) {
-        gnrc_netreg_entry_t *sendto = gnrc_netreg_lookup(type, demux_ctx);
-
-        gnrc_pktbuf_hold(pkt, numof - 1);
-
-        while (sendto) {
+    while (sendto) {
+        if (numof != 0) {
+            gnrc_pktbuf_hold(pkt, 1);
+        }
 #if defined(MODULE_GNRC_NETAPI_MBOX) || defined(MODULE_GNRC_NETAPI_CALLBACKS)
-            int release = 0;
-            switch (sendto->type) {
-                case GNRC_NETREG_TYPE_DEFAULT:
-                    if (_snd_rcv(sendto->target.pid, cmd, pkt) < 1) {
-                        /* unable to dispatch packet */
-                        release = 1;
-                    }
-                    break;
+        int release = 0;
+        switch (sendto->type) {
+            case GNRC_NETREG_TYPE_DEFAULT:
+                if (_snd_rcv(sendto->target.pid, cmd, pkt) < 1) {
+                    /* unable to dispatch packet */
+                    release = 1;
+                }
+                break;
 #ifdef MODULE_GNRC_NETAPI_MBOX
-                case GNRC_NETREG_TYPE_MBOX:
-                    if (_snd_rcv_mbox(sendto->target.mbox, cmd, pkt) < 1) {
-                        /* unable to dispatch packet */
-                        release = 1;
-                    }
-                    break;
+            case GNRC_NETREG_TYPE_MBOX:
+                if (_snd_rcv_mbox(sendto->target.mbox, cmd, pkt) < 1) {
+                    /* unable to dispatch packet */
+                    release = 1;
+                }
+                break;
 #endif
 #ifdef MODULE_GNRC_NETAPI_CALLBACKS
-                case GNRC_NETREG_TYPE_CB:
-                    sendto->target.cbd->cb(cmd, pkt, sendto->target.cbd->ctx);
-                    break;
+            case GNRC_NETREG_TYPE_CB:
+                sendto->target.cbd->cb(cmd, pkt, sendto->target.cbd->ctx);
+                break;
 #endif
-                default:
-                    /* unknown dispatch type */
-                    release = 1;
-                    break;
-            }
-            if (release) {
-                gnrc_pktbuf_release(pkt);
-            }
+            default:
+                /* unknown dispatch type */
+                release = 1;
+                break;
+        }
+        if (release) {
+            gnrc_pktbuf_release(pkt);
+        }
 #else
-            if (_snd_rcv(sendto->target.pid, cmd, pkt) < 1) {
-                /* unable to dispatch packet */
-                gnrc_pktbuf_release(pkt);
-            }
-#endif
-            sendto = gnrc_netreg_getnext(sendto);
+        if (_snd_rcv(sendto->target.pid, cmd, pkt) < 1) {
+            /* unable to dispatch packet */
+            gnrc_pktbuf_release(pkt);
         }
+#endif
+        numof++;
+        sendto = gnrc_netreg_getnext(sendto);
     }
-
     return numof;
 }
 
diff --git a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
index ee9619f4eabfbb277b00c8541422de2e04576597..fa6cf2097c68617bb8c3cc6da1b2903fd97d9d6c 100644
--- a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
+++ b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
@@ -219,7 +219,7 @@ static void _dispatch_next_header(gnrc_pktsnip_t *current, gnrc_pktsnip_t *pkt,
 
     /* dispatch IPv6 extension header only once */
     if (should_dispatch_current_type) {
-        bool should_release = (gnrc_netreg_num(GNRC_NETTYPE_IPV6, nh) == 0) &&
+        bool should_release = (!gnrc_netreg_lookup(GNRC_NETTYPE_IPV6, nh)) &&
                               (!interested);
 
         if (!should_release) {