diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12dc76b..e1b8ffb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,11 @@ TODO
   - Use \t in summary output
 - Investigate spurious 0-0:0 ASes in PingAll output
 
+### Fixed
+
+- Fixed mangled output with mode SHOW_SCMP_ONLY
+  [#31](https://github.com/netsec-ethz/scion-java-multiping/pull/31)
+
 ## [0.6.1] - 2025-12-12
 
 ### Changed
diff --git a/src/main/java/org/scion/multiping/PingAll.java b/src/main/java/org/scion/multiping/PingAll.java
index d048f71..654cae9 100644
--- a/src/main/java/org/scion/multiping/PingAll.java
+++ b/src/main/java/org/scion/multiping/PingAll.java
@@ -196,7 +196,9 @@ private void runAS(ParseAssignments.HostEntry remote) throws IOException {
       if (paths.isEmpty()) {
         String src = ScionUtil.toStringIA(service.getLocalIsdAs());
         String dst = ScionUtil.toStringIA(remote.getIsdAs());
-        if (!SHOW_ONLY_ICMP) {
+        if (SHOW_ONLY_ICMP) {
+          clearPrintQueue();
+        } else {
           println("WARNING: No path found from " + src + " to " + dst);
         }
         summary.incAsNoPathFound(remote.getIsdAs());
@@ -231,6 +233,7 @@ private void runAS(ParseAssignments.HostEntry remote) throws IOException {
     summary.add(result);
 
     if (msgs[0] == null) {
+      clearPrintQueue();
       return;
     }