diff --git a/lldb/tools/debugserver/source/debugserver.cpp b/lldb/tools/debugserver/source/debugserver.cpp
index e02bd07643d1..a22f046771d9 100644
--- a/lldb/tools/debugserver/source/debugserver.cpp
+++ b/lldb/tools/debugserver/source/debugserver.cpp
@@ -824,8 +824,9 @@ FileLogCallback(void *baton, uint32_t flags, const char *format, va_list args)
     if (baton == NULL || format == NULL)
         return;
 
-    ::vfprintf ((FILE *)baton, format, args);
-    ::fprintf ((FILE *)baton, "\n");
+    ::vfprintf((FILE *)baton, format, args);
+    ::fprintf((FILE *)baton, "\n");
+    ::fflush((FILE *)baton);
 }