diff --git a/LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt b/LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt
index d9cf73793..a2563cab3 100644
--- a/LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt
+++ b/LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt
@@ -24,7 +24,13 @@ class KoeConfiguration(val serverConfig: ServerConfig) {
 
         if (nasSupported) {
             log.info("Enabling JDA-NAS")
-            setFramePollerFactory(UdpQueueFramePollerFactory())
+            var bufferSize = serverConfig.bufferDurationMs ?: UdpQueueFramePollerFactory.DEFAULT_BUFFER_DURATION
+            if (bufferSize <= 0) {
+                log.warn("Buffer size of {}ms is illegal. Defaulting to {}",
+                        bufferSize, UdpQueueFramePollerFactory.DEFAULT_BUFFER_DURATION)
+                bufferSize = UdpQueueFramePollerFactory.DEFAULT_BUFFER_DURATION
+            }
+            setFramePollerFactory(UdpQueueFramePollerFactory(bufferSize))
         } else {
             log.warn("This system and architecture appears to not support native audio sending! "
                     + "GC pauses may cause your bot to stutter during playback.")
diff --git a/build.gradle b/build.gradle
index f6fb5d9d7..327e0844b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ subprojects {
         //@formatter:off
         lavaplayerVersion               = '1.3.46'
         lavaplayerIpRotatorVersion      = '0.1.7'
-        koeVersion                      = '7c5fa6e'
+        koeVersion                      = '98af1e8'
 
         springBootVersion               = "${springBootVersion}"
         springWebSocketVersion          = '5.1.9.RELEASE'