diff --git a/ext/libstrawberry-tagreader/tagreader.cpp b/ext/libstrawberry-tagreader/tagreader.cpp
index 64ac34bb7..0c8811082 100644
--- a/ext/libstrawberry-tagreader/tagreader.cpp
+++ b/ext/libstrawberry-tagreader/tagreader.cpp
@@ -358,6 +358,10 @@ void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *s
 
     song->set_bitdepth(file_asf->audioProperties()->bitsPerSample());
 
+    if (file_asf->tag()) {
+      Decode(file_asf->tag()->comment(), nullptr, song->mutable_comment());
+    }
+
     const TagLib::ASF::AttributeListMap &attributes_map = file_asf->tag()->attributeListMap();
 
     if (attributes_map.contains(kASF_OriginalDate_ID)) {
diff --git a/tests/src/tagreader_test.cpp b/tests/src/tagreader_test.cpp
index 2790ee159..8b89500ea 100644
--- a/tests/src/tagreader_test.cpp
+++ b/tests/src/tagreader_test.cpp
@@ -1261,7 +1261,7 @@ TEST_F(TagReaderTest, TestASFAudioFileTagging) {
     //EXPECT_EQ("strawberry performer", song.performer());
     //EXPECT_EQ("strawberry grouping", song.grouping());
     EXPECT_EQ("strawberry genre", song.genre());
-    //EXPECT_EQ("strawberry comment", song.comment());
+    EXPECT_EQ("strawberry comment", song.comment());
     //EXPECT_EQ("strawberry lyrics", song.lyrics());
     EXPECT_EQ(12, song.track());
     //EXPECT_EQ(1234, song.disc());
@@ -1297,7 +1297,7 @@ TEST_F(TagReaderTest, TestASFAudioFileTagging) {
     //EXPECT_EQ("new performer", song.performer());
     //EXPECT_EQ("new grouping", song.grouping());
     EXPECT_EQ("new genre", song.genre());
-    //EXPECT_EQ("new comment", song.comment());
+    EXPECT_EQ("new comment", song.comment());
     //EXPECT_EQ("new lyrics", song.lyrics());
     EXPECT_EQ(21, song.track());
     //EXPECT_EQ(4321, song.disc());
@@ -1332,7 +1332,7 @@ TEST_F(TagReaderTest, TestASFAudioFileTagging) {
     //EXPECT_EQ("strawberry performer", song.performer());
     //EXPECT_EQ("strawberry grouping", song.grouping());
     EXPECT_EQ("strawberry genre", song.genre());
-    //EXPECT_EQ("strawberry comment", song.comment());
+    EXPECT_EQ("strawberry comment", song.comment());
     //EXPECT_EQ("strawberry lyrics", song.lyrics());
     EXPECT_EQ(12, song.track());
     //EXPECT_EQ(1234, song.disc());