diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp
index 664d6cd22..825aef107 100644
--- a/src/engine/gstengine.cpp
+++ b/src/engine/gstengine.cpp
@@ -608,6 +608,8 @@ void GstEngine::EndOfStreamReached(const int pipeline_id, const bool has_next_tr
   }
 
   if (!has_next_track) {
+    GstEnginePipelinePtr old_pipeline = current_pipeline_;
+    FinishPipeline(old_pipeline);
     current_pipeline_ = GstEnginePipelinePtr();
     BufferingFinished();
   }