diff --git a/client/players/LocalAudioPlayer.js b/client/players/LocalAudioPlayer.js
index a0384d54d..7fc17e7aa 100644
--- a/client/players/LocalAudioPlayer.js
+++ b/client/players/LocalAudioPlayer.js
@@ -46,20 +46,7 @@ export default class LocalAudioPlayer extends EventEmitter {
     this.player.addEventListener('loadedmetadata', this.evtLoadedMetadata.bind(this))
     this.player.addEventListener('timeupdate', this.evtTimeupdate.bind(this))
 
-    var mimeTypes = [
-      'audio/flac',
-      'audio/mpeg',
-      'audio/mp4',
-      'audio/ogg',
-      'audio/aac',
-      'audio/x-ms-wma',
-      'audio/x-aiff',
-      'audio/webm',
-      // `audio/matroska` is the correct mimetype, but the server still uses `audio/x-matroska`
-      // ref: https://www.iana.org/assignments/media-types/media-types.xhtml
-      'audio/matroska',
-      'audio/x-matroska'
-    ]
+    var mimeTypes = ['audio/flac', 'audio/mpeg', 'audio/mp4', 'audio/ogg', 'audio/aac', 'audio/x-ms-wma', 'audio/x-aiff', 'audio/webm']
     var mimeTypeCanPlayMap = {}
     mimeTypes.forEach((mt) => {
       var canPlay = this.player.canPlayType(mt)
diff --git a/server/objects/Stream.js b/server/objects/Stream.js
index 70361463f..5aa013e8e 100644
--- a/server/objects/Stream.js
+++ b/server/objects/Stream.js
@@ -73,7 +73,7 @@ class Stream extends EventEmitter {
     return [AudioMimeType.FLAC, AudioMimeType.OPUS, AudioMimeType.WMA, AudioMimeType.AIFF, AudioMimeType.WEBM, AudioMimeType.WEBMA, AudioMimeType.AWB, AudioMimeType.CAF]
   }
   get codecsToForceAAC() {
-    return ['alac', 'ac3', 'eac3', 'opus']
+    return ['alac', 'ac3', 'eac3']
   }
   get userToken() {
     return this.user.token
diff --git a/server/utils/constants.js b/server/utils/constants.js
index 925035e17..cc5217f41 100644
--- a/server/utils/constants.js
+++ b/server/utils/constants.js
@@ -48,8 +48,6 @@ module.exports.AudioMimeType = {
   AIF: 'audio/x-aiff',
   WEBM: 'audio/webm',
   WEBMA: 'audio/webm',
-  // TODO: Switch to `audio/matroska`? marked as deprecated in IANA registry
-  // ref: https://datatracker.ietf.org/doc/html/rfc9559
   MKA: 'audio/x-matroska',
   AWB: 'audio/amr-wb',
   CAF: 'audio/x-caf',