diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index decaa407..27ec4784 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -2550,8 +2550,11 @@ babel_shutdown(struct proto *P)
 
   TRACE(D_EVENTS, "Shutdown requested");
 
-  WALK_LIST(ifa, p->interfaces)
+  WALK_LIST_FIRST(ifa, p->interfaces)
+  {
     babel_iface_shutdown(ifa);
+    babel_remove_iface(p, ifa);
+  }
 
   return PS_DOWN;
 }