diff --git a/sys/net/network_layer/ng_icmpv6/ng_icmpv6.c b/sys/net/network_layer/ng_icmpv6/ng_icmpv6.c
index 4750f05a6777cee63ff012385bf729142643bd14..a27734fc007e33a9ae3d538898e199be59444324 100644
--- a/sys/net/network_layer/ng_icmpv6/ng_icmpv6.c
+++ b/sys/net/network_layer/ng_icmpv6/ng_icmpv6.c
@@ -135,7 +135,7 @@ void ng_icmpv6_demux(kernel_pid_t iface, ng_pktsnip_t *pkt)
     }
 
     /* ICMPv6 is not interested anymore so `- 1` */
-    ng_pktbuf_hold(pkt, ng_netreg_num(NG_NETTYPE_ICMPV6, hdr->type) - 1);
+    ng_pktbuf_hold(pkt, ng_netreg_num(NG_NETTYPE_ICMPV6, hdr->type));
 
     while (sendto != NULL) {
         ng_netapi_receive(sendto->pid, pkt);
diff --git a/sys/shell/commands/sc_icmpv6_echo.c b/sys/shell/commands/sc_icmpv6_echo.c
index 0fb065f9a9a2f3d0bb56b78782dbe7b480c63894..c1a1ab1f295b0fb50a0bb931f457e21599bf3921 100644
--- a/sys/shell/commands/sc_icmpv6_echo.c
+++ b/sys/shell/commands/sc_icmpv6_echo.c
@@ -178,8 +178,10 @@ int _icmpv6_ping(int argc, char **argv)
                 case NG_NETAPI_MSG_TYPE_RCV:
                     vtimer_now(&stop);
                     stop = timex_sub(stop, start);
-                    success += _handle_reply((ng_pktsnip_t *)msg.content.ptr,
-                                             timex_uint64(stop));
+
+                    ng_pktsnip_t *pkt = (ng_pktsnip_t *)msg.content.ptr;
+                    success += _handle_reply(pkt, timex_uint64(stop));
+                    ng_pktbuf_release(pkt);
 
                     if (timex_cmp(stop, max_rtt) > 0) {
                         max_rtt = stop;