diff --git a/src/SdpGenerator.c b/src/SdpGenerator.c
index 046b63a..0717c79 100644
--- a/src/SdpGenerator.c
+++ b/src/SdpGenerator.c
@@ -412,13 +412,10 @@ static PSDP_OPTION getAttributesList(char*urlSafeAddr) {
             err |= addAttributeString(&optionHead, "x-nv-audio.surround.AudioQuality", "0");
             HighQualitySurroundEnabled = false;
 
-            if ((AudioCallbacks.capabilities & CAPABILITY_SLOW_OPUS_DECODER) != 0) {
-                // Use 20 ms packets for slow decoders to save CPU time
-                AudioPacketDuration = 20;
-            }
-            else if ((AudioCallbacks.capabilities & CAPABILITY_SUPPORTS_ARBITRARY_AUDIO_DURATION) != 0 &&
-                      OriginalVideoBitrate < LOW_AUDIO_BITRATE_TRESHOLD) {
-                // Use 10 ms packets for slow networks to balance latency and bandwidth usage
+            if ((AudioCallbacks.capabilities & CAPABILITY_SLOW_OPUS_DECODER) ||
+                     ((AudioCallbacks.capabilities & CAPABILITY_SUPPORTS_ARBITRARY_AUDIO_DURATION) != 0 &&
+                       OriginalVideoBitrate < LOW_AUDIO_BITRATE_TRESHOLD)) {
+                // Use 10 ms packets for slow devices and networks to balance latency and bandwidth usage
                 AudioPacketDuration = 10;
             }
             else {