diff --git a/CHANGELOG b/CHANGELOG
index de834873..4298562c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -83,6 +83,9 @@ HISTORY
 
   ++ Bugfixes:
 
+  2009-04-18 Simon Goldschmidt
+  * api_msg.c: fixed bug #25695: Segmentation fault in do_writemore()
+
   2009-04-15 Simon Goldschmidt
   * sockets.c: tried to fix bug #23559: lwip_recvfrom problem with tcp
 
diff --git a/src/api/api_msg.c b/src/api/api_msg.c
index 5a1eb086..73ccbfef 100644
--- a/src/api/api_msg.c
+++ b/src/api/api_msg.c
@@ -980,6 +980,8 @@ do_writemore(struct netconn *conn)
       write_finished = 1;
       conn->write_msg = NULL;
       conn->write_offset = 0;
+      /* API_EVENT might call tcp_tmr, so reset conn->state now */
+      conn->state = NETCONN_NONE;
     }
     err = tcp_output_nagle(conn->pcb.tcp);
     conn->err = err;