diff --git a/src/ptf/dataplane.py b/src/ptf/dataplane.py
index fd250fe..1f5dcbb 100644
--- a/src/ptf/dataplane.py
+++ b/src/ptf/dataplane.py
@@ -249,9 +249,9 @@ def fileno(self):
         """
         return self.socket.getsockopt(nnpy.SOL_SOCKET, nnpy.RCVFD)
 
-    def __send_port_msg(self, msg_type, port_number, more):
+    def __send_port_msg(self, msg_type, port_number, more, flags=0):
         hdr = struct.pack("<iii", msg_type, port_number, more)
-        self.socket.send(hdr)
+        self.socket.send(hdr, flags)
 
     def __send_info_req_msg(self, port_number, info_type):
         self.__send_port_msg(self.MSG_TYPE_INFO_REQ, port_number, info_type)
@@ -268,7 +268,7 @@ def port_add(self, port_number):
 
     def port_remove(self, port_number):
         self.ports.remove(port_number)
-        self.__send_port_msg(self.MSG_TYPE_PORT_REMOVE, port_number, 0)
+        self.__send_port_msg(self.MSG_TYPE_PORT_REMOVE, port_number, 0, nnpy.DONTWAIT)
 
     def port_bring_up(self, port_number):
         self.__send_port_msg(