diff --git a/nest/proto.c b/nest/proto.c
index fb24e573..6c89f7e0 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -521,9 +521,10 @@ proto_feed_more(void *P)
 {
   struct proto *p = P;
 
-  DBG("Feeding protocol %s continued\n", p->name);
   if (p->core_state != FS_FEEDING)
     return;
+
+  DBG("Feeding protocol %s continued\n", p->name);
   if (rt_feed_baby(p))
     {
       p->core_state = FS_HAPPY;
@@ -542,6 +543,9 @@ proto_feed(void *P)
 {
   struct proto *p = P;
 
+  if (p->core_state != FS_FEEDING)
+    return;
+
   DBG("Feeding protocol %s\n", p->name);
   proto_add_announce_hook(p, p->table);
   if_feed_baby(p);