diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index d0b8da3d50..1f8e0268b9 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -563,6 +563,7 @@ int boinc_get_status(BOINC_STATUS *s) {
 static void send_trickle_up_msg() {
     char buf[MSG_CHANNEL_SIZE];
     BOINCINFO("Sending Trickle Up Message");
+    if (standalone) return;
     strcpy(buf, "");
     if (have_new_trickle_up) {
         strcat(buf, "<have_new_trickle_up/>\n");
diff --git a/checkin_notes b/checkin_notes
index b6dd21c402..831cf697b4 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7007,3 +7007,10 @@ Charlie 8 Oct 2011
 
     client/
         coproc_detect.cpp
+
+David  8 Oct 2011
+    - API: don't crash if send trickle msg running standalone.
+        From Christian Ries.
+
+    api/
+        boinc_api.cpp