diff --git a/sys/net/network_layer/ng_ndp/ng_ndp.c b/sys/net/network_layer/ng_ndp/ng_ndp.c
index 816d35e454..51eb066b35 100644
--- a/sys/net/network_layer/ng_ndp/ng_ndp.c
+++ b/sys/net/network_layer/ng_ndp/ng_ndp.c
@@ -19,7 +19,6 @@
 #include <string.h>
 
 #include "byteorder.h"
-#include "net/fib.h"
 #include "net/ng_icmpv6.h"
 #include "net/ng_ipv6.h"
 #include "net/ng_ipv6/ext/rh.h"
@@ -312,9 +311,6 @@ void ng_ndp_retrans_nbr_sol(ng_ipv6_nc_t *nc_entry)
                   ipv6_addr_to_str(addr_str, &nc_entry->ipv6_addr, sizeof(addr_str)),
                   nc_entry->iface);
 
-#ifdef MODULE_FIB
-            fib_remove_entry((uint8_t *) & (nc_entry->ipv6_addr), sizeof(ipv6_addr_t));
-#endif
             ng_ipv6_nc_remove(nc_entry->iface, &nc_entry->ipv6_addr);
         }
     }
diff --git a/sys/net/network_layer/ng_ndp/node/ng_ndp_node.c b/sys/net/network_layer/ng_ndp/node/ng_ndp_node.c
index 87992be8ca..e12771dc33 100644
--- a/sys/net/network_layer/ng_ndp/node/ng_ndp_node.c
+++ b/sys/net/network_layer/ng_ndp/node/ng_ndp_node.c
@@ -93,25 +93,11 @@ kernel_pid_t ng_ndp_node_next_hop_l2addr(uint8_t *l2addr, uint8_t *l2addr_len,
             (ng_ipv6_netif_addr_get(prefix)->flags &
              NG_IPV6_NETIF_ADDR_FLAGS_NDP_ON_LINK)) {
             next_hop_ip = dst;
-#ifdef MODULE_FIB
-            /* We don't care if FIB is full, this is just for efficiency
-             * for later sends */
-            fib_add_entry(iface, (uint8_t *)dst, sizeof(ipv6_addr_t), 0,
-                          (uint8_t *)next_hop_ip, sizeof(ipv6_addr_t), 0,
-                          FIB_LIFETIME_NO_EXPIRE);
-#endif
         }
     }
 
     if (next_hop_ip == NULL) {
         next_hop_ip = ng_ndp_internal_default_router();
-#ifdef MODULE_FIB
-        /* We don't care if FIB is full, this is just for efficiency for later
-         * sends */
-        fib_add_entry(iface, (uint8_t *)dst, sizeof(ipv6_addr_t), 0,
-                      (uint8_t *)next_hop_ip, sizeof(ipv6_addr_t), 0,
-                      FIB_LIFETIME_NO_EXPIRE);
-#endif
     }
 
     if (next_hop_ip != NULL) {