diff --git a/ChangeLog b/ChangeLog
index c777c6238..a2f7bdc62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,7 @@
     closing current search field.
 13. Fix combo-box text changed signal for Qt5 builds.
 14. Don't have double spacer when cover-widget is hidden.
+15. Fix crash in context view if song tracks changed quickly.
 
 1.4.1
 -----
diff --git a/context/songview.cpp b/context/songview.cpp
index 67be84d9b..568b20279 100644
--- a/context/songview.cpp
+++ b/context/songview.cpp
@@ -762,6 +762,7 @@ void SongView::downloadFinished()
     if (reply) {
         reply->deleteLater();
         if (job==reply) {
+            job=0;
             if (reply->ok()) {
                 QString file=reply->property("file").toString();
                 if (!file.isEmpty() && file==currentSong.file) {
@@ -775,7 +776,6 @@ void SongView::downloadFinished()
                     }
                 }
             }
-            job=0;
         }
     }
     getLyrics();