diff --git a/src/core/song.cpp b/src/core/song.cpp
index 799546a09..ed95eca7a 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -512,7 +512,6 @@ void Song::InitFromProtobuf(const pb::tagreader::SongMetadata& pb) {
   d->genre_ = QStringFromStdString(pb.genre());
   d->comment_ = QStringFromStdString(pb.comment());
   d->compilation_ = pb.compilation();
-  d->playcount_ = pb.playcount();
   d->skipcount_ = pb.skipcount();
   d->lastplayed_ = pb.lastplayed();
   d->score_ = pb.score();
@@ -536,6 +535,10 @@ void Song::InitFromProtobuf(const pb::tagreader::SongMetadata& pb) {
     d->rating_ = pb.rating();
   }
 
+  if (pb.has_playcount()) {
+    d->playcount_ = pb.playcount();
+  }
+
   InitArtManual();
 }