diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 79414de..f66857c 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-17 Hasso Tepper <hasso at quagga.net>
+
+	* bgp_route.c: Clear peer's routing table regardless whether it's
+	  configured or not. Being not configured is even better reason to
+	  do it.
+
 2005-01-05 Paul Jakma <paul@dishone.st>
 
 	* bgp_packet.c: (bgp_write) set socket to nonblock while writing
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index dfcb081..16fcc89 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2248,9 +2248,6 @@
   struct peer *rsclient;
   struct listnode *nn;
 
-  if (! peer->afc[afi][safi])
-    return;
-
   if (safi != SAFI_MPLS_VPN)
     bgp_clear_route_table (peer, afi, safi, NULL, NULL);
   else