diff --git a/src/status_checker.cpp b/src/status_checker.cpp
index 864072df..93be8ab9 100644
--- a/src/status_checker.cpp
+++ b/src/status_checker.cpp
@@ -284,9 +284,9 @@ void NcmpcppStatusChanged(MPDConnection *Mpd, MPDStatusChanges changed, void *da
 		{
 			if (!mPlaylist->Empty())
 			{
-				if (Config.repeat_one_mode && repeat_one_allowed && (old_playing+1 == now_playing || !now_playing))
+				if (Config.repeat_one_mode && repeat_one_allowed)
 				{
-					std::swap<int>(now_playing,old_playing);
+					std::swap(now_playing, old_playing);
 					Mpd->Play(now_playing);
 				}
 				if (old_playing >= 0)