diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/PipedAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/PipedAudioStream.java
index 5ad42157e16..e8c20c13101 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/PipedAudioStream.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/PipedAudioStream.java
@@ -18,6 +18,7 @@
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.util.LinkedList;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -111,13 +112,18 @@ protected PipedOutputStream getOutputStream() {
     /**
      * Creates a new piped stream group used to open new streams and write data to them.
      *
-     * Internal pipe size 1s.
+     * Internal pipe size 0.5s.
      *
      * @param format the audio format of the group audio streams
      * @return a group instance.
      */
     public static Group newGroup(AudioFormat format) {
-        return new Group(format, 1024 * 10);
+        int pipeSize = Math.round(( //
+        (float) Objects.requireNonNull(format.getFrequency()) * //
+                (float) Objects.requireNonNull(format.getBitDepth()) * //
+                (float) Objects.requireNonNull(format.getChannels()) //
+        ) / 2f);
+        return new Group(format, pipeSize);
     }
 
     /**
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/javasound/AudioPlayer.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/javasound/AudioPlayer.java
index cca20644198..3d9144297bf 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/javasound/AudioPlayer.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/javasound/AudioPlayer.java
@@ -49,7 +49,7 @@ public class AudioPlayer extends Thread {
     /**
      * Constructs an AudioPlayer to play the passed AudioStream
      *
-     * @param audioStream The audio stream to play
+     * @param audioStream The AudioStream to play
      */
     public AudioPlayer(AudioStream audioStream) {
         this.audioStream = audioStream;