diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 9898aa9ab..f540f19cd 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -47,6 +47,7 @@
  - [Stephane Senart](https://github.com/ssenart)
  - [Ömer Erdinç Yağmurlu](https://github.com/omeryagmurlu)
  - [Keegan Dahm](https://github.com/keegandahm)
+ - [GodTamIt](https://github.com/GodTamIt)
 
 # Emby Contributors
 
diff --git a/src/scripts/browserDeviceProfile.js b/src/scripts/browserDeviceProfile.js
index d40bee1fe..cc6ef6333 100644
--- a/src/scripts/browserDeviceProfile.js
+++ b/src/scripts/browserDeviceProfile.js
@@ -667,12 +667,13 @@ import browser from './browser';
             }
         }
 
-        if (canPlayVp8) {
+        if (webmAudioCodecs.length && webmVideoCodecs.length) {
             profile.TranscodingProfiles.push({
                 Container: 'webm',
                 Type: 'Video',
-                AudioCodec: 'vorbis',
-                VideoCodec: 'vpx',
+                AudioCodec: webmAudioCodecs.join(','),
+                // TODO: Remove workaround when servers migrate away from 'vpx' for transcoding profiles.
+                VideoCodec: (canPlayVp8 ? webmVideoCodecs.concat('vpx') : webmVideoCodecs).join(','),
                 Context: 'Streaming',
                 Protocol: 'http',
                 // If audio transcoding is needed, limit channels to number of physical audio channels