diff --git a/source/utils/deviceCapabilities.brs b/source/utils/deviceCapabilities.brs
index e554a6799..0911ad9a0 100644
--- a/source/utils/deviceCapabilities.brs
+++ b/source/utils/deviceCapabilities.brs
@@ -379,8 +379,7 @@ function getDeviceProfile() as object
         "IsRequired": true
     }
     '
-    ' add mp3 directly to transcoding profile.
-    ' for music i think?
+    ' add mp3 to TranscodingProfile for music
     deviceProfile.TranscodingProfiles.push({
         "Container": "mp3",
         "Type": "Audio",
@@ -398,30 +397,6 @@ function getDeviceProfile() as object
         "MaxAudioChannels": maxAudioChannels
     })
 
-    ' setup container arrays
-    tsArray = {
-        "Container": "ts",
-        "Context": "Streaming",
-        "Protocol": "hls",
-        "Type": "Video",
-        "AudioCodec": tsAudioCodecs,
-        "VideoCodec": tsVideoCodecs,
-        "MaxAudioChannels": maxAudioChannels,
-        "MinSegments": 1,
-        "BreakOnNonKeyFrames": false
-    }
-    mp4Array = {
-        "Container": "mp4",
-        "Context": "Streaming",
-        "Protocol": "hls",
-        "Type": "Video",
-        "AudioCodec": mp4AudioCodecs,
-        "VideoCodec": mp4VideoCodecs,
-        "MaxAudioChannels": maxAudioChannels,
-        "MinSegments": 1,
-        "BreakOnNonKeyFrames": false
-    }
-
     ' set preferred audio codec for transcoding
     if isValid(surroundSoundCodec)
         ' use preferred surround sound codec
@@ -475,6 +450,29 @@ function getDeviceProfile() as object
         })
     end if
 
+    tsArray = {
+        "Container": "ts",
+        "Context": "Streaming",
+        "Protocol": "hls",
+        "Type": "Video",
+        "AudioCodec": tsAudioCodecs,
+        "VideoCodec": tsVideoCodecs,
+        "MaxAudioChannels": maxAudioChannels,
+        "MinSegments": 1,
+        "BreakOnNonKeyFrames": false
+    }
+    mp4Array = {
+        "Container": "mp4",
+        "Context": "Streaming",
+        "Protocol": "hls",
+        "Type": "Video",
+        "AudioCodec": mp4AudioCodecs,
+        "VideoCodec": mp4VideoCodecs,
+        "MaxAudioChannels": maxAudioChannels,
+        "MinSegments": 1,
+        "BreakOnNonKeyFrames": false
+    }
+
     ' apply max res to transcoding profile
     if maxResSetting <> "off"
         tsArray.Conditions = [maxVideoHeightArray, maxVideoWidthArray]