diff --git a/runbot/models/host.py b/runbot/models/host.py
index cb3088f7..f1f8de9f 100644
--- a/runbot/models/host.py
+++ b/runbot/models/host.py
@@ -251,6 +251,10 @@ class Host(models.Model):
                     ir_log['message'] = 'Log limit reached (full logs are still available in the log file)'
                 elif log_counter < 0:
                     continue
+                else:
+                    if len(ir_log['message']) > 10000:
+                        ir_log['message'] = ir_log['message'][:10000] + "\n ...<message too long, truncated>"
+
                 ir_log['build_id'] = build.id
                 logs_to_send.append({k:ir_log[k] for k in ir_log if k != 'id'})
             build.log_counter = log_counter