diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c
index 857644d..9960fb4 100644
--- a/src/core/osmo_io.c
+++ b/src/core/osmo_io.c
@@ -395,8 +395,7 @@
 void osmo_iofd_write_enable(struct osmo_io_fd *iofd)
 {
 	iofd->write_enabled = true;
-	if (iofd->tx_queue.current_length > 0)
-		osmo_iofd_ops.write_enable(iofd);
+	osmo_iofd_ops.write_enable(iofd);
 }
 
 /*! Disable writing to this iofd
diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c
index bc203c0..dd86f29 100644
--- a/src/core/osmo_io_poll.c
+++ b/src/core/osmo_io_poll.c
@@ -110,7 +110,15 @@
 
 			talloc_free(msghdr);
 			msgb_free(msg);
+		} else {
+			if (iofd->mode == OSMO_IO_FD_MODE_READ_WRITE)
+				/* Socket is writable, but we have no data to send. A non-blocking/async
+				   connect() is signalled this way. */
+				iofd->io_ops.write_cb(iofd, 0, NULL);
+			if (osmo_iofd_txqueue_len(iofd) == 0)
+				iofd_poll_ops.write_disable(iofd);
 		}
+
 	}
 }