diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp
index 19bccefc5..b653bf492 100644
--- a/src/engine/gstengine.cpp
+++ b/src/engine/gstengine.cpp
@@ -572,7 +572,14 @@ void GstEngine::HandlePipelineError(const int pipeline_id, const QString &messag
   BufferingFinished();
   emit StateChanged(Engine::Error);
 
-  if (domain == static_cast<int>(GST_RESOURCE_ERROR) && (error_code == static_cast<int>(GST_RESOURCE_ERROR_NOT_FOUND) || error_code == static_cast<int>(GST_RESOURCE_ERROR_NOT_AUTHORIZED))) {
+  if (
+      (domain == static_cast<int>(GST_RESOURCE_ERROR) && (
+        error_code == static_cast<int>(GST_RESOURCE_ERROR_NOT_FOUND) ||
+        error_code == static_cast<int>(GST_RESOURCE_ERROR_OPEN_READ) ||
+        error_code == static_cast<int>(GST_RESOURCE_ERROR_NOT_AUTHORIZED)
+      ))
+      || (domain == static_cast<int>(GST_STREAM_ERROR) && error_code == GST_STREAM_ERROR_TYPE_NOT_FOUND)
+      ) {
      emit InvalidSongRequested(stream_url_);
    }
   else {