diff --git a/autotests/allalbumsmodeltest.cpp b/autotests/allalbumsmodeltest.cpp
--- a/autotests/allalbumsmodeltest.cpp
+++ b/autotests/allalbumsmodeltest.cpp
@@ -282,23 +282,25 @@
         QSignalSpy endRemoveRowsSpy(&albumsModel, &AllAlbumsModel::rowsRemoved);
         QSignalSpy dataChangedSpy(&albumsModel, &AllAlbumsModel::dataChanged);
 
+        QCOMPARE(albumsModel.rowCount(), 0);
         QCOMPARE(beginInsertRowsSpy.count(), 0);
         QCOMPARE(endInsertRowsSpy.count(), 0);
         QCOMPARE(beginRemoveRowsSpy.count(), 0);
         QCOMPARE(endRemoveRowsSpy.count(), 0);
         QCOMPARE(dataChangedSpy.count(), 0);
 
         musicDb.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
-        while(beginInsertRowsSpy.count() < 4) {
+        while(beginInsertRowsSpy.count() < 5) {
             QCOMPARE(beginInsertRowsSpy.wait(500), true);
         }
-        while(endInsertRowsSpy.count() < 4) {
+        while(endInsertRowsSpy.count() < 5) {
             QCOMPARE(endInsertRowsSpy.wait(500), true);
         }
 
-        QCOMPARE(beginInsertRowsSpy.count(), 4);
-        QCOMPARE(endInsertRowsSpy.count(), 4);
+        QCOMPARE(albumsModel.rowCount(), 5);
+        QCOMPARE(beginInsertRowsSpy.count(), 5);
+        QCOMPARE(endInsertRowsSpy.count(), 5);
         QCOMPARE(beginRemoveRowsSpy.count(), 0);
         QCOMPARE(endRemoveRowsSpy.count(), 0);
         QCOMPARE(dataChangedSpy.count(), 0);
@@ -322,6 +324,7 @@
             QCOMPARE(endRemoveRowsSpy.wait(500), true);
         }
 
+        QCOMPARE(albumsModel.rowCount(), 4);
         QCOMPARE(beginInsertRowsSpy.count(), 5);
         QCOMPARE(endInsertRowsSpy.count(), 5);
         QCOMPARE(beginRemoveRowsSpy.count(), 1);
diff --git a/autotests/mediaplaylisttest.cpp b/autotests/mediaplaylisttest.cpp
--- a/autotests/mediaplaylisttest.cpp
+++ b/autotests/mediaplaylisttest.cpp
@@ -6139,34 +6139,26 @@
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
-    QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
-
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
-    QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(3, 0)));
-
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 4);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
-    QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(2, 0)));
-
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 5);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
-
-    QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 }
 
 void MediaPlayListTest::randomAndContinuePlayList()
@@ -6271,25 +6263,19 @@
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
-    QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
-
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 4);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
-    QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(3, 0)));
-
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 5);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
-
-    QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(2, 0)));
 }
 
 void MediaPlayListTest::continuePlayList()
@@ -6629,8 +6615,6 @@
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
 
-    QCOMPARE(myPlayListSave.currentTrack(), QPersistentModelIndex(myPlayListSave.index(0, 0)));
-
     myPlayListSave.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 3);
@@ -6642,8 +6626,6 @@
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
 
-    QCOMPARE(myPlayListSave.currentTrack(), QPersistentModelIndex(myPlayListSave.index(3, 0)));
-
     myPlayListRestore.setPersistentState(myPlayListSave.persistentState());
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 3);
@@ -6659,7 +6641,8 @@
 
     QCOMPARE(myPlayListRestore.repeatPlay(), true);
     QCOMPARE(myPlayListRestore.randomPlay(), true);
-    QCOMPARE(myPlayListRestore.currentTrack(), QPersistentModelIndex(myPlayListRestore.index(3, 0)));
+    const auto indexSavePlaylist = myPlayListRestore.currentTrack();
+    QCOMPARE(myPlayListRestore.currentTrack(), QPersistentModelIndex(myPlayListRestore.index(indexSavePlaylist.row(), 0)));
 }
 
 void MediaPlayListTest::removeBeforeCurrentTrack()
diff --git a/src/manageaudioplayer.cpp b/src/manageaudioplayer.cpp
--- a/src/manageaudioplayer.cpp
+++ b/src/manageaudioplayer.cpp
@@ -280,9 +280,7 @@
     } else {
         switch(mPlayerPlaybackState) {
         case StoppedState:
-            if (mCurrentTrack != mOldCurrentTrack) {
-                notifyPlayerSourceProperty();
-            }
+            notifyPlayerSourceProperty();
             mSkippingCurrentTrack = false;
             if (mPlayListModel && mOldCurrentTrack.isValid()) {
                 mPlayListModel->setData(mOldCurrentTrack, MediaPlayList::NotPlaying, mIsPlayingRole);