diff --git a/src/core/raw.c b/src/core/raw.c
index b61b57cb..1ebc0aca 100644
--- a/src/core/raw.c
+++ b/src/core/raw.c
@@ -383,6 +383,7 @@ raw_remove(struct raw_pcb *pcb)
       if (pcb2->next != NULL && pcb2->next == pcb) {
         /* remove pcb from list */
         pcb2->next = pcb->next;
+        break;
       }
     }
   }
diff --git a/src/core/udp.c b/src/core/udp.c
index 0835ac75..e4d51221 100644
--- a/src/core/udp.c
+++ b/src/core/udp.c
@@ -1131,6 +1131,7 @@ udp_remove(struct udp_pcb *pcb)
       if (pcb2->next != NULL && pcb2->next == pcb) {
         /* remove pcb from list */
         pcb2->next = pcb->next;
+        break;
       }
     }
   }