diff --git a/source/api/Items.bs b/source/api/Items.bs
index 05262bece..786512639 100644
--- a/source/api/Items.bs
+++ b/source/api/Items.bs
@@ -81,6 +81,19 @@ function ItemPostPlaybackInfo(id as string, mediaSourceId = "" as string, audioT
                             end if
                         end if
                     end for
+
+                    ' don't direct play multi-channel AAC
+                    if selectedAudioStream.Codec <> invalid and LCase(selectedAudioStream.Codec) = "aac"
+                        for each rule in deviceProfile.DirectPlayProfiles
+                            if rule.audioCodec <> invalid
+                                if rule.AudioCodec = "aac"
+                                    rule.AudioCodec = ""
+                                else if rule.AudioCodec.Left(4) = "aac,"
+                                    rule.AudioCodec = mid(rule.AudioCodec, 5)
+                                end if
+                            end if
+                        end for
+                    end if
                 end if
 
             end if
diff --git a/source/utils/deviceCapabilities.bs b/source/utils/deviceCapabilities.bs
index 384838972..44065db66 100644
--- a/source/utils/deviceCapabilities.bs
+++ b/source/utils/deviceCapabilities.bs
@@ -87,7 +87,7 @@ function GetDirectPlayProfiles() as object
     }
     ' all possible codecs (besides those restricted by user settings)
     videoCodecs = ["h264", "mpeg4 avc", "vp8", "vp9", "h263", "mpeg1"]
-    audioCodecs = ["mp3", "mp2", "pcm", "lpcm", "wav", "ac3", "ac4", "aiff", "wma", "flac", "alac", "aac", "opus", "dts", "wmapro", "vorbis", "eac3", "mpg123"]
+    audioCodecs = ["aac", "mp3", "mp2", "pcm", "lpcm", "wav", "ac3", "ac4", "aiff", "wma", "flac", "alac", "opus", "dts", "wmapro", "vorbis", "eac3", "mpg123"]
 
     ' check if hevc is disabled
     if globalUserSettings["playback.compatibility.disablehevc"] = false