diff --git a/mpd.cpp b/mpd.cpp
index 47b02ea..0477f1d 100644
--- a/mpd.cpp
+++ b/mpd.cpp
@@ -96,9 +96,8 @@ void CMPD::Update()
         int newsongid = mpd_status_get_song_id(status);
         int newsongpos = mpd_status_get_elapsed_time(status);
         int curplaytime = mpd_stats_get_play_time(stats);
-
-        // new song
-        if(newsongid != _songid) {
+        // new song (or the same song but from the beginning after it has been played long enough before)
+        if(newsongid != _songid || (_song.getDuration() != -1 && _songpos > (_song.getDuration()/2) && newsongpos < _songpos && newsongpos < 10)) {
             _songid = newsongid;
             _songpos = newsongpos;
             _start = curplaytime;
@@ -107,6 +106,8 @@ void CMPD::Update()
             if(song) {
                 GotNewSong(song);
                 mpd_song_free(song);
+            } else {
+                _song = Song();
             }
         }
 
diff --git a/mpd.h b/mpd.h
index c4bf0c2..2842ef9 100644
--- a/mpd.h
+++ b/mpd.h
@@ -19,7 +19,7 @@ class Song {
 	int getDuration() const { return duration; }
 private:
 	std::string albumartist, artist, title, album;
-	int duration;
+	int duration = -1;
 };
 
 class CMPD