diff --git a/server/core/gateway.c b/server/core/gateway.c
index 006bcbcf0..1e74ae951 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -2007,6 +2007,8 @@ int main(int argc, char **argv)
 
 return_main:
 
+    mxs_log_flush_sync();
+
     if (daemon_mode && rc != MAXSCALE_SHUTDOWN)
     {
         /** Notify the parent process that an error has occurred */