diff --git a/playback/src/player.rs b/playback/src/player.rs
index e9663a706..7d1b5cf86 100644
--- a/playback/src/player.rs
+++ b/playback/src/player.rs
@@ -917,11 +917,19 @@ impl PlayerTrackLoader {
             AudioFileFormat::MP3_160_ENC => 20.,
             AudioFileFormat::AAC_24 => 3.,
             AudioFileFormat::AAC_48 => 6.,
+            AudioFileFormat::AAC_160 => 20.,
+            AudioFileFormat::AAC_320 => 40.,
+            AudioFileFormat::MP4_128 => 16.,
+            AudioFileFormat::OTHER5 => 40.,
             AudioFileFormat::FLAC_FLAC => 112., // assume 900 kbit/s on average
             AudioFileFormat::XHE_AAC_12 => 1.5,
             AudioFileFormat::XHE_AAC_16 => 2.,
             AudioFileFormat::XHE_AAC_24 => 3.,
             AudioFileFormat::FLAC_FLAC_24BIT => 3.,
+            AudioFileFormat::UNKNOWN_FORMAT => {
+                error!("Unknown stream data rate");
+                return None;
+            }
         };
         let data_rate: f32 = kbps * 1024.;
         Some(data_rate.ceil() as usize)
diff --git a/protocol/proto/metadata.proto b/protocol/proto/metadata.proto
index fa7aec95a..b8098a754 100644
--- a/protocol/proto/metadata.proto
+++ b/protocol/proto/metadata.proto
@@ -306,15 +306,20 @@ message AudioFile {
         MP3_160_ENC = 7;
         AAC_24 = 8;
         AAC_48 = 9;
+        AAC_160 = 10;
+        AAC_320 = 11;
+        MP4_128 = 12;
+        OTHER5 = 13;
         FLAC_FLAC = 16;
         XHE_AAC_24 = 18;
         XHE_AAC_16 = 19;
         XHE_AAC_12 = 20;
         FLAC_FLAC_24BIT = 22;
+        UNKNOWN_FORMAT = 255;
     }
 
     optional bytes file_id = 1;
-    optional Format format = 2;
+    optional Format format = 2 [default = UNKNOWN_FORMAT];
 }
 
 message Video {