diff --git a/tests/topotests/lib/bmp_collector/bmpserver b/tests/topotests/lib/bmp_collector/bmpserver
index 944f299a03..264a281c49 100755
--- a/tests/topotests/lib/bmp_collector/bmpserver
+++ b/tests/topotests/lib/bmp_collector/bmpserver
@@ -34,6 +34,9 @@ def main():
         try:
             while True:
                 data = connection.recv(BGP_MAX_SIZE)
+                if not data:
+                    # connection closed
+                    break
                 while len(data) > BMPMsg.MIN_LEN:
                     data = BMPMsg.dissect(data, log_file=LOG_FILE)
         except Exception as e: