diff --git a/src/covermanager/albumcoverchoicecontroller.cpp b/src/covermanager/albumcoverchoicecontroller.cpp
index 4d0f54d25..ceafef32d 100644
--- a/src/covermanager/albumcoverchoicecontroller.cpp
+++ b/src/covermanager/albumcoverchoicecontroller.cpp
@@ -387,7 +387,7 @@ QUrl AlbumCoverChoiceController::SaveCoverToFileAutomatic(const Song *song, cons
 
 QUrl AlbumCoverChoiceController::SaveCoverToFileAutomatic(const Song::Source source, const QString &artist, const QString &album, const QString &album_id, const QString &album_dir, const QUrl &cover_url, const QImage &image, const bool overwrite) {
 
-  QString filepath = app_->album_cover_loader()->CoverFilePath(source, artist, album, album_id, album_dir, cover_url);
+  QString filepath = app_->album_cover_loader()->CoverFilePath(source, artist, album, album_id, album_dir, cover_url, "jpg");
   if (filepath.isEmpty()) return QUrl();
 
   QUrl new_cover_url(QUrl::fromLocalFile(filepath));
diff --git a/src/covermanager/albumcoverloader.cpp b/src/covermanager/albumcoverloader.cpp
index e527ca009..7dfcbd246 100644
--- a/src/covermanager/albumcoverloader.cpp
+++ b/src/covermanager/albumcoverloader.cpp
@@ -98,27 +98,32 @@ void AlbumCoverLoader::ReloadSettings() {
 
 }
 
-QString AlbumCoverLoader::AlbumCoverFilename(QString artist, QString album) {
+QString AlbumCoverLoader::AlbumCoverFilename(QString artist, QString album, const QString &extension) {
 
   artist.remove('/');
   album.remove('/');
 
-  QString filename = artist + "-" + album + ".jpg";
+  QString filename = artist + "-" + album;
   filename = Utilities::UnicodeToAscii(filename.toLower());
   filename = filename.replace(' ', '-');
   filename = filename.replace("--", "-");
   filename = filename.remove(OrganiseFormat::kInvalidFatCharacters);
-  filename = filename.trimmed();
+  filename = filename.simplified();
+
+  if (!extension.isEmpty()) {
+    filename.append('.');
+    filename.append(extension);
+  }
 
   return filename;
 
 }
 
-QString AlbumCoverLoader::CoverFilePath(const Song &song, const QString &album_dir, const QUrl &cover_url) {
-  return CoverFilePath(song.source(), song.effective_albumartist(), song.album(), song.album_id(), album_dir, cover_url);
+QString AlbumCoverLoader::CoverFilePath(const Song &song, const QString &album_dir, const QUrl &cover_url, const QString &extension) {
+  return CoverFilePath(song.source(), song.effective_albumartist(), song.album(), song.album_id(), album_dir, cover_url, extension);
 }
 
-QString AlbumCoverLoader::CoverFilePath(const Song::Source source, const QString &artist, QString album, const QString &album_id, const QString &album_dir, const QUrl &cover_url) {
+QString AlbumCoverLoader::CoverFilePath(const Song::Source source, const QString &artist, QString album, const QString &album_id, const QString &album_dir, const QUrl &cover_url, const QString &extension) {
 
   album.remove(Song::kAlbumRemoveDisc);
 
@@ -130,7 +135,7 @@ QString AlbumCoverLoader::CoverFilePath(const Song::Source source, const QString
     path = Song::ImageCacheDir(source);
   }
 
-  if (path.right(1) == QDir::separator()) {
+  if (path.right(1) == QDir::separator() || path.right(1) == '/') {
     path.chop(1);
   }
 
@@ -142,13 +147,17 @@ QString AlbumCoverLoader::CoverFilePath(const Song::Source source, const QString
 
   QString filename;
   if (source == Song::Source_Collection && cover_album_dir_ && cover_filename_ == CollectionSettingsPage::SaveCover_Pattern && !cover_pattern_.isEmpty()) {
-    filename = CoverFilenameFromVariable(artist, album) + ".jpg";
+    filename = CoverFilenameFromVariable(artist, album);
     filename.remove(OrganiseFormat::kInvalidFatCharacters);
     if (cover_lowercase_) filename = filename.toLower();
     if (cover_replace_spaces_) filename.replace(QRegExp("\\s"), "-");
+    if (!extension.isEmpty()) {
+      filename.append('.');
+      filename.append(extension);
+    }
   }
   else {
-    filename = CoverFilenameFromSource(source, cover_url, artist, album, album_id);
+    filename = CoverFilenameFromSource(source, cover_url, artist, album, album_id, extension);
   }
 
   QString filepath(path + "/" + filename);
@@ -157,7 +166,7 @@ QString AlbumCoverLoader::CoverFilePath(const Song::Source source, const QString
 
 }
 
-QString AlbumCoverLoader::CoverFilenameFromSource(const Song::Source source, const QUrl &cover_url, const QString &artist, const QString &album, const QString &album_id) {
+QString AlbumCoverLoader::CoverFilenameFromSource(const Song::Source source, const QUrl &cover_url, const QString &artist, const QString &album, const QString &album_id, const QString &extension) {
 
   QString filename;
 
@@ -171,7 +180,7 @@ QString AlbumCoverLoader::CoverFilenameFromSource(const Song::Source source, con
     case Song::Source_Subsonic:
     case Song::Source_Qobuz:
       if (!album_id.isEmpty()) {
-        filename = album_id + ".jpg";
+        filename = album_id;
         break;
       }
       // fallthrough
@@ -181,20 +190,29 @@ QString AlbumCoverLoader::CoverFilenameFromSource(const Song::Source source, con
     case Song::Source_Device:
     case Song::Source_Stream:
     case Song::Source_Unknown:
-      filename = Utilities::Sha1CoverHash(artist, album).toHex() + ".jpg";
+      filename = Utilities::Sha1CoverHash(artist, album).toHex();
       break;
   }
 
+  if (!extension.isEmpty()) {
+    filename.append('.');
+    filename.append(extension);
+  }
+
   return filename;
 
 }
 
-QString AlbumCoverLoader::CoverFilenameFromVariable(const QString &artist, const QString &album) {
+QString AlbumCoverLoader::CoverFilenameFromVariable(const QString &artist, const QString &album, const QString &extension) {
 
   QString filename(cover_pattern_);
   filename.replace("%albumartist", artist);
   filename.replace("%artist", artist);
   filename.replace("%album", album);
+  if (!extension.isEmpty()) {
+    filename.append('.');
+    filename.append(extension);
+  }
   return filename;
 
 }
diff --git a/src/covermanager/albumcoverloader.h b/src/covermanager/albumcoverloader.h
index f5d20c4ab..47c076d5a 100644
--- a/src/covermanager/albumcoverloader.h
+++ b/src/covermanager/albumcoverloader.h
@@ -61,12 +61,13 @@ class AlbumCoverLoader : public QObject {
   void ExitAsync();
   void Stop() { stop_requested_ = true; }
 
-  static QString AlbumCoverFilename(QString artist, QString album);
+  static QString AlbumCoverFilename(QString artist, QString album, const QString &extension);
 
-  QString CoverFilenameFromSource(const Song::Source source, const QUrl &cover_url, const QString &artist, const QString &album, const QString &album_id);
-  QString CoverFilenameFromVariable(const QString &artist, const QString &album);
-  QString CoverFilePath(const Song &song, const QString &album_dir, const QUrl &cover_url);
-  QString CoverFilePath(const Song::Source source, const QString &artist, QString album, const QString &album_id, const QString &album_dir, const QUrl &cover_url);
+  QString CoverFilenameFromSource(const Song::Source source, const QUrl &cover_url, const QString &artist, const QString &album, const QString &album_id, const QString &extension);
+  QString CoverFilenameFromVariable(const QString &artist, const QString &album, const QString &extension = QString());
+  QString CoverFilePath(const Song &song, const QString &album_dir, const QUrl &cover_url, const QString &extension = QString());
+
+  QString CoverFilePath(const Song::Source source, const QString &artist, QString album, const QString &album_id, const QString &album_dir, const QUrl &cover_url, const QString &extension = QString());
 
   quint64 LoadImageAsync(const AlbumCoverLoaderOptions &options, const Song &song);
   virtual quint64 LoadImageAsync(const AlbumCoverLoaderOptions &options, const QUrl &art_automatic, const QUrl &art_manual, const QUrl &song_url = QUrl(), const Song song = Song(), const QImage &embedded_image = QImage());
diff --git a/src/subsonic/subsonicrequest.cpp b/src/subsonic/subsonicrequest.cpp
index d73a83e4d..cd14b5762 100644
--- a/src/subsonic/subsonicrequest.cpp
+++ b/src/subsonic/subsonicrequest.cpp
@@ -29,6 +29,7 @@
 #include <QUrl>
 #include <QRegExp>
 #include <QImage>
+#include <QImageReader>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
@@ -748,32 +749,53 @@ void SubsonicRequest::AlbumCoverReceived(QNetworkReply *reply, const QString alb
   }
 
   if (reply->error() != QNetworkReply::NoError) {
-    Error(QString("%1 (%2)").arg(reply->errorString()).arg(reply->error()));
-    album_covers_requests_sent_.remove(album_id);
+    Error(QString("%1 (%2) for %3").arg(reply->errorString()).arg(reply->error()).arg(url.toString()));
+    if (album_covers_requests_sent_.contains(album_id)) album_covers_requests_sent_.remove(album_id);
     AlbumCoverFinishCheck();
     return;
   }
 
+  if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) {
+    Error(QString("Received HTTP code %1 for %2.").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()).arg(url.toString()));
+    if (album_covers_requests_sent_.contains(album_id)) album_covers_requests_sent_.remove(album_id);
+    AlbumCoverFinishCheck();
+    return;
+  }
+
+  QString mimetype = reply->header(QNetworkRequest::ContentTypeHeader).toString();
+  if (!QImageReader::supportedMimeTypes().contains(mimetype.toUtf8())) {
+    Error(QString("Unsupported mimetype for image reader %1 for %2").arg(mimetype).arg(url.toString()));
+    if (album_covers_requests_sent_.contains(album_id)) album_covers_requests_sent_.remove(album_id);
+    AlbumCoverFinishCheck();
+    return;
+  }
+  QByteArray format = QImageReader::imageFormatsForMimeType(mimetype.toUtf8()).first();
+
   QByteArray data = reply->readAll();
   if (data.isEmpty()) {
     Error(QString("Received empty image data for %1").arg(url.toString()));
-    album_covers_requests_sent_.remove(album_id);
+    if (album_covers_requests_sent_.contains(album_id)) album_covers_requests_sent_.remove(album_id);
     AlbumCoverFinishCheck();
     return;
   }
+  QString fullfilename = filename + "." + format.toLower();
 
   QImage image;
-  if (image.loadFromData(data)) {
-    if (image.save(filename, "JPG")) {
+  if (image.loadFromData(data, format)) {
+    if (image.save(fullfilename, format)) {
       while (album_covers_requests_sent_.contains(album_id)) {
         Song *song = album_covers_requests_sent_.take(album_id);
-        song->set_art_automatic(QUrl::fromLocalFile(filename));
+        song->set_art_automatic(QUrl::fromLocalFile(fullfilename));
       }
     }
+    else {
+      Error(QString("Error saving image data to %1.").arg(fullfilename));
+      if (album_covers_requests_sent_.contains(album_id)) album_covers_requests_sent_.remove(album_id);
+    }
   }
   else {
-    album_covers_requests_sent_.remove(album_id);
-    Error(QString("Error decoding image data from %1").arg(url.toString()));
+    Error(QString("Error decoding image data from %1.").arg(url.toString()));
+    if (album_covers_requests_sent_.contains(album_id)) album_covers_requests_sent_.remove(album_id);
   }
 
   AlbumCoverFinishCheck();
diff --git a/src/tidal/tidalrequest.cpp b/src/tidal/tidalrequest.cpp
index 7eed1ac1d..28fa685a6 100644
--- a/src/tidal/tidalrequest.cpp
+++ b/src/tidal/tidalrequest.cpp
@@ -24,6 +24,7 @@
 #include <QString>
 #include <QUrl>
 #include <QImage>
+#include <QImageReader>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonObject>
@@ -1151,27 +1152,45 @@ void TidalRequest::AlbumCoverReceived(QNetworkReply *reply, const QString &album
     return;
   }
 
+  if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) {
+    Error(QString("Received HTTP code %1 for %2.").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()).arg(url.toString()));
+    if (album_covers_requests_sent_.contains(album_id)) album_covers_requests_sent_.remove(album_id);
+    AlbumCoverFinishCheck();
+    return;
+  }
+
+  QString mimetype = reply->header(QNetworkRequest::ContentTypeHeader).toString();
+  if (!QImageReader::supportedMimeTypes().contains(mimetype.toUtf8())) {
+    Error(QString("Unsupported mimetype for image reader %1 for %2").arg(mimetype).arg(url.toString()));
+    if (album_covers_requests_sent_.contains(album_id)) album_covers_requests_sent_.remove(album_id);
+    AlbumCoverFinishCheck();
+    return;
+  }
+  QByteArray format = QImageReader::imageFormatsForMimeType(mimetype.toUtf8()).first();
+
   QByteArray data = reply->readAll();
   if (data.isEmpty()) {
     Error(QString("Received empty image data for %1").arg(url.toString()));
-    album_covers_requests_sent_.remove(album_id);
+    if (album_covers_requests_sent_.contains(album_id)) album_covers_requests_sent_.remove(album_id);
     AlbumCoverFinishCheck();
     return;
   }
 
   QImage image;
-  if (image.loadFromData(data)) {
-
-    if (image.save(filename, "JPG")) {
+  if (image.loadFromData(data, format)) {
+    if (image.save(filename, format)) {
       while (album_covers_requests_sent_.contains(album_id)) {
         Song *song = album_covers_requests_sent_.take(album_id);
         song->set_art_automatic(QUrl::fromLocalFile(filename));
       }
     }
-
+    else {
+      Error(QString("Error saving image data to %1").arg(filename));
+      if (album_covers_requests_sent_.contains(album_id)) album_covers_requests_sent_.remove(album_id);
+    }
   }
   else {
-    album_covers_requests_sent_.remove(album_id);
+    if (album_covers_requests_sent_.contains(album_id)) album_covers_requests_sent_.remove(album_id);
     Error(QString("Error decoding image data from %1").arg(url.toString()));
   }