diff --git a/common/buffers/src/main/java/io/helidon/common/buffers/CompositeArrayBufferData.java b/common/buffers/src/main/java/io/helidon/common/buffers/CompositeArrayBufferData.java
index ed5cc1a91e5..ace0afd1088 100644
--- a/common/buffers/src/main/java/io/helidon/common/buffers/CompositeArrayBufferData.java
+++ b/common/buffers/src/main/java/io/helidon/common/buffers/CompositeArrayBufferData.java
@@ -46,10 +46,10 @@ public void writeTo(OutputStream out) {
                     datum.writeTo(out);
                     datum.skip(-available);
                 }
+                return;
             }
-        } else {
-            copy().writeTo(out);
         }
+        copy().writeTo(out);
     }
 
     @Override
diff --git a/common/buffers/src/main/java/io/helidon/common/buffers/CompositeListBufferData.java b/common/buffers/src/main/java/io/helidon/common/buffers/CompositeListBufferData.java
index 5c1c2aa0442..83d0b2d9454 100644
--- a/common/buffers/src/main/java/io/helidon/common/buffers/CompositeListBufferData.java
+++ b/common/buffers/src/main/java/io/helidon/common/buffers/CompositeListBufferData.java
@@ -64,10 +64,10 @@ public void writeTo(OutputStream out) {
                     datum.writeTo(out);
                     datum.skip(-available);
                 }
+                return;
             }
-        } else {
-            copy().writeTo(out);
         }
+        copy().writeTo(out);
     }
 
     @Override
diff --git a/http/http/src/main/java/io/helidon/http/HeadersImpl.java b/http/http/src/main/java/io/helidon/http/HeadersImpl.java
index 738a389f94c..f11c6de17a6 100644
--- a/http/http/src/main/java/io/helidon/http/HeadersImpl.java
+++ b/http/http/src/main/java/io/helidon/http/HeadersImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.