diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java
index fb19402f..b9509dcf 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java
@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
+import java.util.regex.Pattern;
 import org.apache.maven.execution.ExecutionEvent;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecution;
@@ -35,6 +36,7 @@ import org.mvndaemon.mvnd.logging.smart.BuildEventListener;
  */
 public class ClientDispatcher extends BuildEventListener {
     private final Collection<Message> queue;
+    private static final Pattern TRAILING_EOLS_PATTERN = Pattern.compile("[\r\n]+$");
 
     public ClientDispatcher(Collection<Message> queue) {
         this.queue = queue;
@@ -78,8 +80,7 @@ public class ClientDispatcher extends BuildEventListener {
     }
 
     public void projectLogMessage(String projectId, String event) {
-        String msg = event.endsWith("\n") ? event.substring(0, event.length() - 1) : event;
-        queue.add(projectId == null ? Message.log(msg) : Message.log(projectId, msg));
+        queue.add(projectId == null ? Message.log(trimTrailingEols(event)) : Message.log(projectId, trimTrailingEols(event)));
     }
 
     public void projectFinished(ExecutionEvent event) {
@@ -108,7 +109,7 @@ public class ClientDispatcher extends BuildEventListener {
     }
 
     public void log(String msg) {
-        queue.add(Message.log(msg));
+        queue.add(Message.log(trimTrailingEols(msg)));
     }
 
     private MavenProject getCurrentProject(MavenSession mavenSession) {
@@ -124,4 +125,8 @@ public class ClientDispatcher extends BuildEventListener {
                 .orElse(mavenSession.getCurrentProject());
     }
 
+    static String trimTrailingEols(String message) {
+        return message == null ? null : TRAILING_EOLS_PATTERN.matcher(message).replaceFirst("");
+    }
+
 }
diff --git a/daemon/src/test/java/org/mvndaemon/mvnd/daemon/ClientDispatcherTest.java b/daemon/src/test/java/org/mvndaemon/mvnd/daemon/ClientDispatcherTest.java
new file mode 100644
index 00000000..a78325e3
--- /dev/null
+++ b/daemon/src/test/java/org/mvndaemon/mvnd/daemon/ClientDispatcherTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.mvndaemon.mvnd.daemon;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ClientDispatcherTest {
+    @Test
+    void trimTrailingEols() {
+        Assertions.assertEquals(null, ClientDispatcher.trimTrailingEols(null));
+        Assertions.assertEquals("foo", ClientDispatcher.trimTrailingEols("foo"));
+        Assertions.assertEquals("foo\nbar", ClientDispatcher.trimTrailingEols("foo\nbar"));
+        Assertions.assertEquals("foo\nbar", ClientDispatcher.trimTrailingEols("foo\nbar\n"));
+        Assertions.assertEquals("foo\nbar", ClientDispatcher.trimTrailingEols("foo\nbar\r\n"));
+        Assertions.assertEquals("foo\nbar", ClientDispatcher.trimTrailingEols("foo\nbar\n\r\n"));
+        Assertions.assertEquals("", ClientDispatcher.trimTrailingEols("\n"));
+    }
+
+}