diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c
index 4cef142..fdb9e32 100644
--- a/src/core/osmo_io.c
+++ b/src/core/osmo_io.c
@@ -433,7 +433,9 @@
 
 	IOFD_FLAG_UNSET(iofd, IOFD_FLAG_CLOSED);
 	osmo_iofd_ops.read_enable(iofd);
-	osmo_iofd_ops.write_enable(iofd);
+
+	if (iofd->tx_queue.current_length > 0)
+		osmo_iofd_ops.write_enable(iofd);
 
 	return rc;
 }
@@ -603,4 +605,14 @@
 	iofd->io_ops = *ioops;
 }
 
+/*! Notify the user if/when the socket is connected
+ *  When the socket is connected the write_cb will be called.
+ *  \param[in] iofd the file descriptor */
+void osmo_iofd_notify_connected(struct osmo_io_fd *iofd)
+{
+	OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_READ_WRITE);
+	osmo_iofd_ops.write_enable(iofd);
+}
+
+
 #endif /* defined(__linux__) */