diff --git a/radio/rfsimulator/simulator.c b/radio/rfsimulator/simulator.c
index 0bfc26b10b..62d08da212 100644
--- a/radio/rfsimulator/simulator.c
+++ b/radio/rfsimulator/simulator.c
@@ -1038,7 +1038,7 @@ static void rfsimulator_end(openair0_device *device) {
   for (int i = 0; i < MAX_FD_RFSIMU; i++) {
     buffer_t *b = &s->buf[i];
     if (b->conn_sock >= 0 )
-      close(b->conn_sock);
+      removeCirBuf(s, b->conn_sock);
   }
   close(s->epollfd);
 }